diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2021-05-10 11:53:02 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2021-05-31 11:53:56 +0200 |
| commit | b44bf9410a6921a232679124ca48daa2a8a15303 (patch) | |
| tree | c796a739ce433801639f71a8ab382b45aa74b287 /arch/m68k/configs/apollo_defconfig | |
| parent | 9a51ebd7e5b6b8aa826d3c24f2077adf3b5df129 (diff) | |
| download | linux-b44bf9410a6921a232679124ca48daa2a8a15303.tar.gz linux-b44bf9410a6921a232679124ca48daa2a8a15303.tar.bz2 linux-b44bf9410a6921a232679124ca48daa2a8a15303.zip | |
m68k: defconfig: Update defconfigs for v5.13-rc1
- Drop CONFIG_NF_LOG_NETDEV=m (removed in commit 1510618e45cb9fb7
("netfilter: nf_log_netdev: merge with nf_log_syslog")),
- Enable modular build of IPv4 packet logging (no longer auto-enabled
since commit db3187ae21bb0cff ("netfilter: nf_log_ipv4: rename to
nf_log_syslog")),
- Drop CONFIG_NF_LOG_BRIDGE=m (removed in commit 77ccee96a67422ac
("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: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20210510095302.4125561-1-geert@linux-m68k.org
Diffstat (limited to 'arch/m68k/configs/apollo_defconfig')
| -rw-r--r-- | arch/m68k/configs/apollo_defconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index 8d4ddcebe7b8..4dc6dcfaf28a 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig @@ -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 |