| Message ID | 20230803191821.36793-2-twoerner@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] arch/arm/configs/omap2plus_defconfig: drop removed options | expand |
* Trevor Woerner <twoerner@gmail.com> [230803 19:18]: > Drop CONFIG_NF_LOG_NETDEV as it was removed in commit 1510618e45cb > ("netfilter: nf_log_netdev: merge with nf_log_syslog"). > > Drop CONFIG_NFT_COUNTER as it was removed in commit 023223dfbfb3 > ("netfilter: nf_tables: make counter support built-in"). > > Drop CONFIG_NF_FLOW_TABLE_IPV6 and CONFIG_NF_FLOW_TABLE_IPV4 as they were > removed in commit c42ba4290b21 ("netfilter: flowtable: remove ipv4/ipv6 > modules"). > > Drop CONFIG_NF_LOG_BRIDGE as it was removed in commit 77ccee96a674 > ("netfilter: nf_log_bridge: merge with nf_log_syslog"). All the changes look good to me in the series, what's the plan for applying them? Regards, Tony
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index b685018dcf54..a87d7d4001b9 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -78,7 +78,6 @@ CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y CONFIG_NETFILTER=y CONFIG_NF_CONNTRACK=m -CONFIG_NF_LOG_NETDEV=m CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMEOUT=y @@ -92,7 +91,6 @@ CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_NETDEV=y CONFIG_NFT_NUMGEN=m CONFIG_NFT_CT=m -CONFIG_NFT_COUNTER=m CONFIG_NFT_CONNLIMIT=m CONFIG_NFT_LOG=m CONFIG_NFT_LIMIT=m @@ -179,7 +177,6 @@ CONFIG_NETFILTER_XT_MATCH_TIME=m CONFIG_NETFILTER_XT_MATCH_U32=m CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_FIB_IPV4=m -CONFIG_NF_FLOW_TABLE_IPV4=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -200,7 +197,6 @@ CONFIG_IP_NF_RAW=m CONFIG_IP_NF_SECURITY=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m -CONFIG_NF_FLOW_TABLE_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -225,7 +221,6 @@ CONFIG_IP6_NF_TARGET_NPT=m CONFIG_NF_TABLES_BRIDGE=m CONFIG_NFT_BRIDGE_META=m CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NF_LOG_BRIDGE=m CONFIG_BRIDGE=m CONFIG_BRIDGE_VLAN_FILTERING=y CONFIG_VLAN_8021Q=m
Drop CONFIG_NF_LOG_NETDEV as it was removed in commit 1510618e45cb ("netfilter: nf_log_netdev: merge with nf_log_syslog"). Drop CONFIG_NFT_COUNTER as it was removed in commit 023223dfbfb3 ("netfilter: nf_tables: make counter support built-in"). Drop CONFIG_NF_FLOW_TABLE_IPV6 and CONFIG_NF_FLOW_TABLE_IPV4 as they were removed in commit c42ba4290b21 ("netfilter: flowtable: remove ipv4/ipv6 modules"). Drop CONFIG_NF_LOG_BRIDGE as it was removed in commit 77ccee96a674 ("netfilter: nf_log_bridge: merge with nf_log_syslog"). Signed-off-by: Trevor Woerner <twoerner@gmail.com> --- arch/arm/configs/omap2plus_defconfig | 5 ----- 1 file changed, 5 deletions(-)