Commit b44bf941 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k: defconfig: Update defconfigs for v5.13-rc1 



  - Drop CONFIG_NF_LOG_NETDEV=m (removed in commit 1510618e
    ("netfilter: nf_log_netdev: merge with nf_log_syslog")),
  - Enable modular build of IPv4 packet logging (no longer auto-enabled
    since commit db3187ae ("netfilter: nf_log_ipv4: rename to
    nf_log_syslog")),
  - Drop CONFIG_NF_LOG_BRIDGE=m (removed in commit 77ccee96
    ("netfilter: nf_log_bridge: merge with nf_log_syslog")),
  - Enable modular build of ECDSA crypto algorithm,
  - Enable modular build of 64bit/32bit division and modulo test.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20210510095302.4125561-1-geert@linux-m68k.org
parent 9a51ebd7

arch/m68k/configs/amiga_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ CONFIG_IPV6_VTI=m 
CONFIG_IPV6_GRE=m

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=m

CONFIG_NF_LOG_NETDEV=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set

# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -207,6 +206,7 @@ CONFIG_NFT_FIB_IPV4=m 
CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NF_LOG_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m

CONFIG_IP_NF_MATCH_ECN=m
@@ -253,7 +253,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_NF_CONNTRACK_BRIDGE=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m
@@ -563,6 +562,7 @@ CONFIG_CRYPTO_TEST=m 
CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECDSA=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_SM2=m

CONFIG_CRYPTO_CURVE25519=m
@@ -627,6 +627,7 @@ CONFIG_KUNIT_ALL_TESTS=m 
CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_TEST_DIV64=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

arch/m68k/configs/apollo_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ CONFIG_IPV6_VTI=m 
CONFIG_IPV6_GRE=m

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=m

CONFIG_NF_LOG_NETDEV=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set

# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -203,6 +202,7 @@ CONFIG_NFT_FIB_IPV4=m 
CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NF_LOG_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m

CONFIG_IP_NF_MATCH_ECN=m
@@ -249,7 +249,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_NF_CONNTRACK_BRIDGE=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m
@@ -519,6 +518,7 @@ CONFIG_CRYPTO_TEST=m 
CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECDSA=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_SM2=m

CONFIG_CRYPTO_CURVE25519=m
@@ -583,6 +583,7 @@ CONFIG_KUNIT_ALL_TESTS=m 
CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_TEST_DIV64=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

arch/m68k/configs/atari_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ CONFIG_IPV6_VTI=m 
CONFIG_IPV6_GRE=m

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=m

CONFIG_NF_LOG_NETDEV=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set

# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -210,6 +209,7 @@ CONFIG_NFT_FIB_IPV4=m 
CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NF_LOG_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m

CONFIG_IP_NF_MATCH_ECN=m
@@ -256,7 +256,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_NF_CONNTRACK_BRIDGE=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m
@@ -541,6 +540,7 @@ CONFIG_CRYPTO_TEST=m 
CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECDSA=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_SM2=m

CONFIG_CRYPTO_CURVE25519=m
@@ -605,6 +605,7 @@ CONFIG_KUNIT_ALL_TESTS=m 
CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_TEST_DIV64=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

arch/m68k/configs/bvme6000_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ CONFIG_IPV6_VTI=m 
CONFIG_IPV6_GRE=m

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=m

CONFIG_NF_LOG_NETDEV=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set

# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -200,6 +199,7 @@ CONFIG_NFT_FIB_IPV4=m 
CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NF_LOG_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m

CONFIG_IP_NF_MATCH_ECN=m
@@ -246,7 +246,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_NF_CONNTRACK_BRIDGE=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m
@@ -512,6 +511,7 @@ CONFIG_CRYPTO_TEST=m 
CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECDSA=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_SM2=m

CONFIG_CRYPTO_CURVE25519=m
@@ -576,6 +576,7 @@ CONFIG_KUNIT_ALL_TESTS=m 
CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_TEST_DIV64=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

arch/m68k/configs/hp300_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ CONFIG_IPV6_VTI=m 
CONFIG_IPV6_GRE=m

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=m

CONFIG_NF_LOG_NETDEV=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set

# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -202,6 +201,7 @@ CONFIG_NFT_FIB_IPV4=m 
CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NF_LOG_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m

CONFIG_IP_NF_MATCH_ECN=m
@@ -248,7 +248,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_NF_CONNTRACK_BRIDGE=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m
@@ -521,6 +520,7 @@ CONFIG_CRYPTO_TEST=m 
CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECDSA=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_SM2=m

CONFIG_CRYPTO_CURVE25519=m
@@ -585,6 +585,7 @@ CONFIG_KUNIT_ALL_TESTS=m 
CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_TEST_DIV64=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m