diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-10-07 21:06:52 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-10-07 21:06:52 +0200 |
| commit | 09d31c064a2d3ab7d603a87afaed22839805bace (patch) | |
| tree | 872821a0d8f28c47ef50abcf10ff6b1605e77109 /kernel-i686-debug.config | |
| parent | 0dbf92288130dcca69740eed562a95105d27f446 (diff) | |
| parent | 1bbfa3a13cfbec603fd4963b9eeb0974255be87f (diff) | |
| download | kernel-09d31c064a2d3ab7d603a87afaed22839805bace.tar.gz kernel-09d31c064a2d3ab7d603a87afaed22839805bace.tar.xz kernel-09d31c064a2d3ab7d603a87afaed22839805bace.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-i686-debug.config')
| -rw-r--r-- | kernel-i686-debug.config | 6 |
1 files changed, 3 insertions, 3 deletions
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 |