diff options
| -rw-r--r-- | configs/fedora/generic/CONFIG_NFT_SOCKET | 2 | ||||
| -rw-r--r-- | configs/fedora/generic/CONFIG_NFT_TPROXY | 2 | ||||
| -rw-r--r-- | configs/fedora/generic/CONFIG_NFT_TUNNEL | 2 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 6 | ||||
| -rw-r--r-- | kernel-aarch64.config | 6 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 6 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 6 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae.config | 6 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 6 | ||||
| -rw-r--r-- | kernel-i686-debug.config | 6 | ||||
| -rw-r--r-- | kernel-i686.config | 6 | ||||
| -rw-r--r-- | kernel-ppc64le-debug.config | 6 | ||||
| -rw-r--r-- | kernel-ppc64le.config | 6 | ||||
| -rw-r--r-- | kernel-s390x-debug.config | 6 | ||||
| -rw-r--r-- | kernel-s390x.config | 6 | ||||
| -rw-r--r-- | kernel-x86_64-debug.config | 6 | ||||
| -rw-r--r-- | kernel-x86_64.config | 6 | ||||
| -rw-r--r-- | kernel.spec | 3 |
18 files changed, 48 insertions, 45 deletions
diff --git a/configs/fedora/generic/CONFIG_NFT_SOCKET b/configs/fedora/generic/CONFIG_NFT_SOCKET index d28a66d0a..84aa8fd92 100644 --- a/configs/fedora/generic/CONFIG_NFT_SOCKET +++ b/configs/fedora/generic/CONFIG_NFT_SOCKET @@ -1 +1 @@ -# CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SOCKET=m diff --git a/configs/fedora/generic/CONFIG_NFT_TPROXY b/configs/fedora/generic/CONFIG_NFT_TPROXY index e8288ff55..d43e8c5f4 100644 --- a/configs/fedora/generic/CONFIG_NFT_TPROXY +++ b/configs/fedora/generic/CONFIG_NFT_TPROXY @@ -1 +1 @@ -# CONFIG_NFT_TPROXY is not set +CONFIG_NFT_TPROXY=m diff --git a/configs/fedora/generic/CONFIG_NFT_TUNNEL b/configs/fedora/generic/CONFIG_NFT_TUNNEL index a6c2fa49d..30f2b484f 100644 --- a/configs/fedora/generic/CONFIG_NFT_TUNNEL +++ b/configs/fedora/generic/CONFIG_NFT_TUNNEL @@ -1 +1 @@ -# CONFIG_NFT_TUNNEL is not set +CONFIG_NFT_TUNNEL=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 3b9a7a6f1..4b1ce9112 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -4170,10 +4170,10 @@ CONFIG_NFT_QUOTA=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m -# CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SOCKET=m CONFIG_NFT_SYNPROXY=m -# CONFIG_NFT_TPROXY is not set -# CONFIG_NFT_TUNNEL is not set +CONFIG_NFT_TPROXY=m +CONFIG_NFT_TUNNEL=m CONFIG_NFT_XFRM=m CONFIG_N_GSM=m CONFIG_N_HDLC=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 6ae43d364..21df2fad3 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -4150,10 +4150,10 @@ CONFIG_NFT_QUOTA=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m -# CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SOCKET=m CONFIG_NFT_SYNPROXY=m -# CONFIG_NFT_TPROXY is not set -# CONFIG_NFT_TUNNEL is not set +CONFIG_NFT_TPROXY=m +CONFIG_NFT_TUNNEL=m CONFIG_NFT_XFRM=m CONFIG_N_GSM=m CONFIG_N_HDLC=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index dd34b603d..27a887ae9 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4245,10 +4245,10 @@ CONFIG_NFT_QUOTA=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m -# CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SOCKET=m CONFIG_NFT_SYNPROXY=m -# CONFIG_NFT_TPROXY is not set -# CONFIG_NFT_TUNNEL is not set +CONFIG_NFT_TPROXY=m +CONFIG_NFT_TUNNEL=m CONFIG_NFT_XFRM=m CONFIG_N_GSM=m CONFIG_N_HDLC=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index cf72d0178..3941abcff 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4119,10 +4119,10 @@ CONFIG_NFT_QUOTA=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m -# CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SOCKET=m CONFIG_NFT_SYNPROXY=m -# CONFIG_NFT_TPROXY is not set -# CONFIG_NFT_TUNNEL is not set +CONFIG_NFT_TPROXY=m +CONFIG_NFT_TUNNEL=m CONFIG_NFT_XFRM=m CONFIG_N_GSM=m CONFIG_N_HDLC=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index a5cc30c9c..02461d14b 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4100,10 +4100,10 @@ CONFIG_NFT_QUOTA=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m -# CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SOCKET=m CONFIG_NFT_SYNPROXY=m -# CONFIG_NFT_TPROXY is not set -# CONFIG_NFT_TUNNEL is not set +CONFIG_NFT_TPROXY=m +CONFIG_NFT_TUNNEL=m CONFIG_NFT_XFRM=m CONFIG_N_GSM=m CONFIG_N_HDLC=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index db99ebe9f..95cc93d01 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4226,10 +4226,10 @@ CONFIG_NFT_QUOTA=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m -# CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SOCKET=m CONFIG_NFT_SYNPROXY=m -# CONFIG_NFT_TPROXY is not set -# CONFIG_NFT_TUNNEL is not set +CONFIG_NFT_TPROXY=m +CONFIG_NFT_TUNNEL=m CONFIG_NFT_XFRM=m CONFIG_N_GSM=m CONFIG_N_HDLC=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index f4016ada0..272fe3f12 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -3861,10 +3861,10 @@ CONFIG_NFT_QUOTA=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m -# CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SOCKET=m CONFIG_NFT_SYNPROXY=m -# CONFIG_NFT_TPROXY is not set -# CONFIG_NFT_TUNNEL is not set +CONFIG_NFT_TPROXY=m +CONFIG_NFT_TUNNEL=m CONFIG_NFT_XFRM=m CONFIG_N_GSM=m CONFIG_N_HDLC=m diff --git a/kernel-i686.config b/kernel-i686.config index 17876af65..f9c8e2035 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -3842,10 +3842,10 @@ CONFIG_NFT_QUOTA=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m -# CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SOCKET=m CONFIG_NFT_SYNPROXY=m -# CONFIG_NFT_TPROXY is not set -# CONFIG_NFT_TUNNEL is not set +CONFIG_NFT_TPROXY=m +CONFIG_NFT_TUNNEL=m CONFIG_NFT_XFRM=m CONFIG_N_GSM=m CONFIG_N_HDLC=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 361aa83f7..82585d81a 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -3583,10 +3583,10 @@ CONFIG_NFT_QUOTA=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m -# CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SOCKET=m CONFIG_NFT_SYNPROXY=m -# CONFIG_NFT_TPROXY is not set -# CONFIG_NFT_TUNNEL is not set +CONFIG_NFT_TPROXY=m +CONFIG_NFT_TUNNEL=m CONFIG_NFT_XFRM=m CONFIG_N_GSM=m CONFIG_N_HDLC=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 9ff7d68c0..0c7b7bcaf 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -3562,10 +3562,10 @@ CONFIG_NFT_QUOTA=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m -# CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SOCKET=m CONFIG_NFT_SYNPROXY=m -# CONFIG_NFT_TPROXY is not set -# CONFIG_NFT_TUNNEL is not set +CONFIG_NFT_TPROXY=m +CONFIG_NFT_TUNNEL=m CONFIG_NFT_XFRM=m CONFIG_N_GSM=m CONFIG_N_HDLC=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 029a2bdd6..c325d31ba 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -3556,10 +3556,10 @@ CONFIG_NFT_QUOTA=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m -# CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SOCKET=m CONFIG_NFT_SYNPROXY=m -# CONFIG_NFT_TPROXY is not set -# CONFIG_NFT_TUNNEL is not set +CONFIG_NFT_TPROXY=m +CONFIG_NFT_TUNNEL=m CONFIG_NFT_XFRM=m # CONFIG_N_GSM is not set CONFIG_N_HDLC=m diff --git a/kernel-s390x.config b/kernel-s390x.config index a67a21f7a..3ff05de88 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3535,10 +3535,10 @@ CONFIG_NFT_QUOTA=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m -# CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SOCKET=m CONFIG_NFT_SYNPROXY=m -# CONFIG_NFT_TPROXY is not set -# CONFIG_NFT_TUNNEL is not set +CONFIG_NFT_TPROXY=m +CONFIG_NFT_TUNNEL=m CONFIG_NFT_XFRM=m # CONFIG_N_GSM is not set CONFIG_N_HDLC=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 1dcffb6d6..a40147d60 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -3906,10 +3906,10 @@ CONFIG_NFT_QUOTA=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m -# CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SOCKET=m CONFIG_NFT_SYNPROXY=m -# CONFIG_NFT_TPROXY is not set -# CONFIG_NFT_TUNNEL is not set +CONFIG_NFT_TPROXY=m +CONFIG_NFT_TUNNEL=m CONFIG_NFT_XFRM=m CONFIG_N_GSM=m CONFIG_N_HDLC=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 0994611ad..99e018991 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -3887,10 +3887,10 @@ CONFIG_NFT_QUOTA=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m -# CONFIG_NFT_SOCKET is not set +CONFIG_NFT_SOCKET=m CONFIG_NFT_SYNPROXY=m -# CONFIG_NFT_TPROXY is not set -# CONFIG_NFT_TUNNEL is not set +CONFIG_NFT_TPROXY=m +CONFIG_NFT_TUNNEL=m CONFIG_NFT_XFRM=m CONFIG_N_GSM=m CONFIG_N_HDLC=m diff --git a/kernel.spec b/kernel.spec index 136cddcfa..39c56a219 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1763,6 +1763,9 @@ fi # # %changelog +* Mon Oct 07 2019 Laura Abbott <labbott@redhat.com> +- Enable a few NFT options (rhbz 1651813) + * Mon Oct 07 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc2.git0.1 - Linux v5.4-rc2 |