diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-29 07:19:38 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-29 07:19:38 +0100 |
| commit | 8bb91cf4c77714ad0903c65859deb7ba1d652106 (patch) | |
| tree | a9246fcceaae2126af4d252be0ca67a9d3c9d4a1 /kernel-x86_64-debug.config | |
| parent | 621b48c95c2549d846fde6c217d483aa04b8acc4 (diff) | |
| parent | c552794cd500b06b635527d8043eacb60b3bd63d (diff) | |
| download | kernel-8bb91cf4c77714ad0903c65859deb7ba1d652106.tar.gz kernel-8bb91cf4c77714ad0903c65859deb7ba1d652106.tar.xz kernel-8bb91cf4c77714ad0903c65859deb7ba1d652106.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.1.0-0.rc2.git3.1.vanilla.knurd.1.fc31kernel-5.1.0-0.rc2.git3.1.vanilla.knurd.1.fc30kernel-5.1.0-0.rc2.git3.1.vanilla.knurd.1.fc29kernel-5.1.0-0.rc2.git3.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel-x86_64-debug.config')
| -rw-r--r-- | kernel-x86_64-debug.config | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 53e740b08..4aa25da33 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2431,8 +2431,8 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -2446,7 +2446,7 @@ CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_PIMSM_V1=y @@ -3767,6 +3767,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m +CONFIG_NF_REJECT_IPV4=m CONFIG_NF_REJECT_IPV6=m CONFIG_NFSD_BLOCKLAYOUT=y CONFIG_NFSD_FAULT_INJECTION=y |