general defconfig cleanups
Subsystems (5)
v3 cover general defconfig cleanups
Drop config options from defconfigs whose code has been removed.
v3:
While reorganizing the patches, I put the wrong commit message with the CONFIG_IP_NF_TARGET_CLUSTERIP option.
v2:
Generate arch-specific patches. In v1 I organized the patches by CONFIG_ option which caused some of the patches to cross architectural lines. This requires cross-arch consensus before they can be applied. Therefore organize the changes by architecture so each one can apply them independently (or not).
Trevor Woerner (4):
arch/arm/configs/*_defconfig cleanup
arch/loongarch/configs/*_defconfig cleanup
arch/mips/configs/*_defconfig cleanup
arch/powerpc/configs/*_defconfig cleanup
arch/arm/configs/keystone_defconfig | 1 - arch/arm/configs/multi_v7_defconfig | 1 - arch/arm/configs/omap2plus_defconfig | 8 -------- arch/loongarch/configs/loongson3_defconfig | 2 -- arch/mips/configs/ip22_defconfig | 1 - arch/mips/configs/malta_defconfig | 1 - arch/mips/configs/malta_kvm_defconfig | 1 - arch/mips/configs/maltaup_xpa_defconfig | 1 - arch/mips/configs/rm200_defconfig | 1 - arch/powerpc/configs/ppc6xx_defconfig | 1 - 10 files changed, 18 deletions(-)
Signature · 1 line
2.41.0.327.gaa9166bcc0ba
PATCH v3 1/4 arch/arm/configs/*_defconfig cleanup
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").
Drop CONFIG_IP_NF_TARGET_CLUSTERIP from any remaining arm defconfigs as it was removed in commit 9db5d918e2c0 ("netfilter: ip_tables: remove clusterip target").
Drop CONFIG_USB_MUSB_AM35X as it was removed in commit 57f8e00d8a82 ("usb:
musb: Drop old unused am35x glue layer").
Drop CONFIG_NFT_OBJREF as it was removed in commit d037abc2414b ("netfilter: nft_objref: make it builtin").
--- arch/arm/configs/keystone_defconfig | 1 - arch/arm/configs/multi_v7_defconfig | 1 - arch/arm/configs/omap2plus_defconfig | 8 -------- 3 files changed, 10 deletions(-)
arch/arm/configs/keystone_defconfig +0 -1
@@ -98,7 +98,6 @@ CONFIG_IP_NF_MATCH_TTL=y CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_REJECT=y CONFIG_IP_NF_MANGLE=y -CONFIG_IP_NF_TARGET_CLUSTERIP=y CONFIG_IP_NF_TARGET_ECN=y CONFIG_IP_NF_TARGET_TTL=y CONFIG_IP_NF_RAW=y
arch/arm/configs/multi_v7_defconfig +0 -1
@@ -851,7 +851,6 @@ CONFIG_USB_MUSB_HDRC=m CONFIG_USB_MUSB_SUNXI=m CONFIG_USB_MUSB_TUSB6010=m CONFIG_USB_MUSB_OMAP2PLUS=m -CONFIG_USB_MUSB_AM35X=m CONFIG_USB_MUSB_DSPS=m CONFIG_USB_MUSB_UX500=m CONFIG_USB_UX500_DMA=y
arch/arm/configs/omap2plus_defconfig +0 -8
@@ -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
@@ -100,7 +98,6 @@ CONFIG_NFT_MASQ=m CONFIG_NFT_REDIR=m CONFIG_NFT_NAT=m CONFIG_NFT_TUNNEL=m -CONFIG_NFT_OBJREF=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m CONFIG_NFT_REJECT=m
@@ -179,7 +176,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
@@ -193,14 +189,12 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m 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 +219,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
@@ -560,7 +553,6 @@ CONFIG_USB_STORAGE=m CONFIG_USB_MUSB_HDRC=m CONFIG_USB_MUSB_TUSB6010=m CONFIG_USB_MUSB_OMAP2PLUS=m -CONFIG_USB_MUSB_AM35X=m CONFIG_USB_MUSB_DSPS=m CONFIG_USB_INVENTRA_DMA=y CONFIG_USB_TI_CPPI41_DMA=y
Signature · 1 line
2.41.0.327.gaa9166bcc0ba
PATCH v3 2/4 arch/loongarch/configs/*_defconfig cleanup
In reply to Trevor WoernerDrop CONFIG_IP_NF_TARGET_CLUSTERIP as it was removed in commit 9db5d918e2c0 ("netfilter: ip_tables: remove clusterip target").
Drop CONFIG_NFT_OBJREF as it was removed in commit d037abc2414b ("netfilter: nft_objref: make it builtin").
--- arch/loongarch/configs/loongson3_defconfig | 2 -- 1 file changed, 2 deletions(-)
arch/loongarch/configs/loongson3_defconfig +0 -2
@@ -137,7 +137,6 @@ CONFIG_NFT_MASQ=m CONFIG_NFT_REDIR=m CONFIG_NFT_NAT=m CONFIG_NFT_TUNNEL=m -CONFIG_NFT_OBJREF=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m CONFIG_NFT_REJECT=m
@@ -227,7 +226,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m
Signature · 1 line
2.41.0.327.gaa9166bcc0ba
Re: [PATCH v3 2/4] arch/loongarch/configs/*_defconfig cleanup
Quoted 24 lines · Trevor Woerner
Drop
CONFIG_IP_NF_TARGET_CLUSTERIPas it was removed in commit9db5d918e2c0("netfilter:ip_tables: remove clusterip target").Drop
CONFIG_NFT_OBJREFas it was removed in commitd037abc2414b("netfilter:nft_objref: make it builtin").Signed-off-by Trevor Woerner <[email protected]>--- arch/loongarch/configs/loongson3_defconfig | 2 -- 1 file changed, 2 deletions(-)arch/loongarch/configs/loongson3_defconfig +0
-1@@ -137,7 +137,6 @@ CONFIG_NFT_MASQ=m CONFIG_NFT_REDIR=m CONFIG_NFT_NAT=m CONFIG_NFT_TUNNEL=m -CONFIG_NFT_OBJREF=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m CONFIG_NFT_REJECT=m
arch/loongarch/configs/loongson3_defconfig CONFIG_IP_NF_TARGET_MASQUERADE=m · line 231
Quoted 7 lines
arch/loongarch/configs/loongson3_defconfig +0
-1@@ -227,7 +226,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m
Thanks!
Signature · 3 lines
WANG "xen0n" Xuerui Linux/LoongArch mailing list: https://lore.kernel.org/loongarch/
PATCH v3 3/4 arch/mips/configs/*_defconfig cleanup
In reply to Trevor WoernerDrop CONFIG_IP_NF_TARGET_CLUSTERIP from any remaining mips defconfigs as it was removed in commit 9db5d918e2c0 ("netfilter: ip_tables: remove clusterip target").
--- arch/mips/configs/ip22_defconfig | 1 - arch/mips/configs/malta_defconfig | 1 - arch/mips/configs/malta_kvm_defconfig | 1 - arch/mips/configs/maltaup_xpa_defconfig | 1 - arch/mips/configs/rm200_defconfig | 1 - 5 files changed, 5 deletions(-)
arch/mips/configs/ip22_defconfig +0 -1
@@ -127,7 +127,6 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m
arch/mips/configs/malta_defconfig +0 -1
@@ -127,7 +127,6 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m
arch/mips/configs/malta_kvm_defconfig +0 -1
@@ -131,7 +131,6 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m
arch/mips/configs/maltaup_xpa_defconfig +0 -1
@@ -128,7 +128,6 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m
arch/mips/configs/rm200_defconfig +0 -1
@@ -90,7 +90,6 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m
Signature · 1 line
2.41.0.327.gaa9166bcc0ba
Re: [PATCH v3 3/4] arch/mips/configs/*_defconfig cleanup
Quoted 4 lines · Trevor Woerner
Drop
CONFIG_IP_NF_TARGET_CLUSTERIPfrom any remaining mips defconfigs as it was removed in commit9db5d918e2c0("netfilter:ip_tables: remove clusterip target").
Quoted 8 lines
Signed-off-by Trevor Woerner <[email protected]>--- arch/mips/configs/ip22_defconfig | 1 - arch/mips/configs/malta_defconfig | 1 - arch/mips/configs/malta_kvm_defconfig | 1 - arch/mips/configs/maltaup_xpa_defconfig | 1 - arch/mips/configs/rm200_defconfig | 1 - 5 files changed, 5 deletions(-)
Re: [PATCH v3 3/4] arch/mips/configs/*_defconfig cleanup
In reply to Trevor WoernerQuoted 4 lines · Trevor Woerner
Drop
CONFIG_IP_NF_TARGET_CLUSTERIPfrom any remaining mips defconfigs as it was removed in commit9db5d918e2c0("netfilter:ip_tables: remove clusterip target").
Quoted 8 lines
Signed-off-by Trevor Woerner <[email protected]>--- arch/mips/configs/ip22_defconfig | 1 - arch/mips/configs/malta_defconfig | 1 - arch/mips/configs/malta_kvm_defconfig | 1 - arch/mips/configs/maltaup_xpa_defconfig | 1 - arch/mips/configs/rm200_defconfig | 1 - 5 files changed, 5 deletions(-)
applied to mips-next.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
PATCH v3 4/4 arch/powerpc/configs/*_defconfig cleanup
In reply to Trevor WoernerDrop CONFIG_IP_NF_TARGET_CLUSTERIP as it was removed in commit 9db5d918e2c0 ("netfilter: ip_tables: remove clusterip target").
--- arch/powerpc/configs/ppc6xx_defconfig | 1 - 1 file changed, 1 deletion(-)
arch/powerpc/configs/ppc6xx_defconfig +0 -1
@@ -183,7 +183,6 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m
Signature · 1 line
2.41.0.327.gaa9166bcc0ba
Re: (subset) [PATCH v3 0/4] general defconfig cleanups
In reply to Trevor WoernerQuoted 6 lines · Trevor Woerner
Drop config options from defconfigs whose code has been removed.
v3:
While reorganizing the patches, I put the wrong commit message with theCONFIG_IP_NF_TARGET_CLUSTERIPoption.
Quoted 8 lines
v2:
Generate arch-specific patches. In v1 I organized the patches byCONFIG_option which caused some of the patches to cross architectural lines. This requires cross-arch consensus before they can be applied. Therefore organize the changes by architecture so each one can apply them independently (or not).[...]
Patch 4 applied to powerpc/next.
[4/4] arch/powerpc/configs/*_defconfig cleanup
https://git.kernel.org/powerpc/c/455d3d38ef9d5f69c504d1af5fa2359563ea4148
cheers