Message ID | 189efc09-0863-11b5-2983-f27530176307@free.fr (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Regenerate arm64 defconfig for current kernel | expand |
On Fri, Nov 09, 2018 at 02:01:13AM +0100, Marc Gonzalez wrote: > Commit a0ae2562c6c4 ("netfilter: conntrack: remove l3proto abstraction") > folded NF_CONNTRACK_IPV4 and NF_CONNTRACK_IPV6 into NF_CONNTRACK. > > Signed-off-by: Marc Gonzalez <marc.w.gonzalez@free.fr> Same here, this one is no longer needed either. -Olof
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 8d6878c1e794..58741c07a6ef 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -156,14 +156,12 @@ CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NF_CONNTRACK_IPV4=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_NAT=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_MANGLE=m -CONFIG_NF_CONNTRACK_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_REJECT=m
Commit a0ae2562c6c4 ("netfilter: conntrack: remove l3proto abstraction") folded NF_CONNTRACK_IPV4 and NF_CONNTRACK_IPV6 into NF_CONNTRACK. Signed-off-by: Marc Gonzalez <marc.w.gonzalez@free.fr> --- arch/arm64/configs/defconfig | 2 -- 1 file changed, 2 deletions(-)