Skip to content

Commit 8d21670

Browse files
twoernerarndb
authored andcommitted
ARM: defconfig: cleanup orphaned CONFIGs
Drop CONFIG_NF_LOG_NETDEV as it was removed in commit 1510618 ("netfilter: nf_log_netdev: merge with nf_log_syslog"). Drop CONFIG_NFT_COUNTER as it was removed in commit 023223d ("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 c42ba42 ("netfilter: flowtable: remove ipv4/ipv6 modules"). Drop CONFIG_NF_LOG_BRIDGE as it was removed in commit 77ccee9 ("netfilter: nf_log_bridge: merge with nf_log_syslog"). Drop CONFIG_IP_NF_TARGET_CLUSTERIP from any remaining arm defconfigs as it was removed in commit 9db5d91 ("netfilter: ip_tables: remove clusterip target"). Drop CONFIG_USB_MUSB_AM35X as it was removed in commit 57f8e00 ("usb: musb: Drop old unused am35x glue layer"). Drop CONFIG_NFT_OBJREF as it was removed in commit d037abc ("netfilter: nft_objref: make it builtin"). Signed-off-by: Trevor Woerner <twoerner@gmail.com> Link: https://lore.kernel.org/r/20230919125112.15515-2-twoerner@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 6465e26 commit 8d21670

3 files changed

Lines changed: 0 additions & 10 deletions

File tree

arch/arm/configs/keystone_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ CONFIG_IP_NF_MATCH_TTL=y
9898
CONFIG_IP_NF_FILTER=y
9999
CONFIG_IP_NF_TARGET_REJECT=y
100100
CONFIG_IP_NF_MANGLE=y
101-
CONFIG_IP_NF_TARGET_CLUSTERIP=y
102101
CONFIG_IP_NF_TARGET_ECN=y
103102
CONFIG_IP_NF_TARGET_TTL=y
104103
CONFIG_IP_NF_RAW=y

arch/arm/configs/multi_v7_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,6 @@ CONFIG_USB_MUSB_HDRC=m
857857
CONFIG_USB_MUSB_SUNXI=m
858858
CONFIG_USB_MUSB_TUSB6010=m
859859
CONFIG_USB_MUSB_OMAP2PLUS=m
860-
CONFIG_USB_MUSB_AM35X=m
861860
CONFIG_USB_MUSB_DSPS=m
862861
CONFIG_USB_MUSB_UX500=m
863862
CONFIG_USB_UX500_DMA=y

arch/arm/configs/omap2plus_defconfig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ CONFIG_IP_PNP_BOOTP=y
7878
CONFIG_IP_PNP_RARP=y
7979
CONFIG_NETFILTER=y
8080
CONFIG_NF_CONNTRACK=m
81-
CONFIG_NF_LOG_NETDEV=m
8281
CONFIG_NF_CONNTRACK_ZONES=y
8382
CONFIG_NF_CONNTRACK_EVENTS=y
8483
CONFIG_NF_CONNTRACK_TIMEOUT=y
@@ -92,15 +91,13 @@ CONFIG_NF_TABLES_INET=y
9291
CONFIG_NF_TABLES_NETDEV=y
9392
CONFIG_NFT_NUMGEN=m
9493
CONFIG_NFT_CT=m
95-
CONFIG_NFT_COUNTER=m
9694
CONFIG_NFT_CONNLIMIT=m
9795
CONFIG_NFT_LOG=m
9896
CONFIG_NFT_LIMIT=m
9997
CONFIG_NFT_MASQ=m
10098
CONFIG_NFT_REDIR=m
10199
CONFIG_NFT_NAT=m
102100
CONFIG_NFT_TUNNEL=m
103-
CONFIG_NFT_OBJREF=m
104101
CONFIG_NFT_QUEUE=m
105102
CONFIG_NFT_QUOTA=m
106103
CONFIG_NFT_REJECT=m
@@ -179,7 +176,6 @@ CONFIG_NETFILTER_XT_MATCH_TIME=m
179176
CONFIG_NETFILTER_XT_MATCH_U32=m
180177
CONFIG_NFT_DUP_IPV4=m
181178
CONFIG_NFT_FIB_IPV4=m
182-
CONFIG_NF_FLOW_TABLE_IPV4=m
183179
CONFIG_IP_NF_IPTABLES=m
184180
CONFIG_IP_NF_MATCH_AH=m
185181
CONFIG_IP_NF_MATCH_ECN=m
@@ -193,14 +189,12 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
193189
CONFIG_IP_NF_TARGET_NETMAP=m
194190
CONFIG_IP_NF_TARGET_REDIRECT=m
195191
CONFIG_IP_NF_MANGLE=m
196-
CONFIG_IP_NF_TARGET_CLUSTERIP=m
197192
CONFIG_IP_NF_TARGET_ECN=m
198193
CONFIG_IP_NF_TARGET_TTL=m
199194
CONFIG_IP_NF_RAW=m
200195
CONFIG_IP_NF_SECURITY=m
201196
CONFIG_NFT_DUP_IPV6=m
202197
CONFIG_NFT_FIB_IPV6=m
203-
CONFIG_NF_FLOW_TABLE_IPV6=m
204198
CONFIG_IP6_NF_IPTABLES=m
205199
CONFIG_IP6_NF_MATCH_AH=m
206200
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -225,7 +219,6 @@ CONFIG_IP6_NF_TARGET_NPT=m
225219
CONFIG_NF_TABLES_BRIDGE=m
226220
CONFIG_NFT_BRIDGE_META=m
227221
CONFIG_NFT_BRIDGE_REJECT=m
228-
CONFIG_NF_LOG_BRIDGE=m
229222
CONFIG_BRIDGE=m
230223
CONFIG_BRIDGE_VLAN_FILTERING=y
231224
CONFIG_VLAN_8021Q=m
@@ -560,7 +553,6 @@ CONFIG_USB_STORAGE=m
560553
CONFIG_USB_MUSB_HDRC=m
561554
CONFIG_USB_MUSB_TUSB6010=m
562555
CONFIG_USB_MUSB_OMAP2PLUS=m
563-
CONFIG_USB_MUSB_AM35X=m
564556
CONFIG_USB_MUSB_DSPS=m
565557
CONFIG_USB_INVENTRA_DMA=y
566558
CONFIG_USB_TI_CPPI41_DMA=y

0 commit comments

Comments
 (0)