commit 86cded5fc52567774b596827544874499532b8ae
author Geert Uytterhoeven <geert@linux-m68k.org> Mon Mar 02 08:24:42 2020 +0100
committer Geert Uytterhoeven <geert@linux-m68k.org> Mon Mar 09 11:12:29 2020 +0100
tree 757cbab688558e84e91cf6b7a2b2f5efd8fd8aa0
parent 573a73abc316ca6fe30fd52eaaf31c93077b2b23

m68k: defconfig: Update defconfigs for v5.6-rc4

  - Drop CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m (depends on
    BRIDGE_NETFILTER, which is disabled by default since commit
    98bda63e20daab95 ("net: disable BRIDGE_NETFILTER by default")),
  - Enable modular build of the WireGuard secure network tunnel,
  - Drop CONFIG_CRYPTO_LIB_{BLAKE2S,CHACHA20POLY1305,CURVE25519}=m
    (auto-enabled by CONFIG_WIREGUARD).

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

arch/m68k/configs/apollo_defconfig

diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index 484cb16..db2402c 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -169,7 +169,6 @@
 CONFIG_NETFILTER_XT_MATCH_OSF=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -348,6 +347,7 @@
 CONFIG_TCM_PSCSI=m
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
 CONFIG_EQUALIZER=m
 CONFIG_NET_TEAM=m
 CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -569,9 +569,6 @@
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_USER_API_AEAD=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 # CONFIG_CRYPTO_HW is not set
 CONFIG_CRC32_SELFTEST=m
 CONFIG_CRC64=m