diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2025-10-13 14:59:22 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2025-11-24 11:03:50 +0100 |
| commit | aaf4e92341b081bac1230f22619b0a298e285dab (patch) | |
| tree | 6e10294cc21e28334a2c0ff6130799de63784140 /arch/m68k/configs/multi_defconfig | |
| parent | 3a8660878839faadb4f1a6dd72c3179c1df56787 (diff) | |
| download | lwn-aaf4e92341b081bac1230f22619b0a298e285dab.tar.gz lwn-aaf4e92341b081bac1230f22619b0a298e285dab.zip | |
m68k: defconfig: Update defconfigs for v6.18-rc1
- Drop CONFIG_SCTP_COOKIE_HMAC_SHA1=y (removed in commit
2f3dd6ec901f29ae ("sctp: Convert cookie authentication to use
HMAC-SHA256")),
- Drop CONFIG_BATMAN_ADV_NC=y (removed in commit 87b95082db32ae1c
("batman-adv: remove network coding support")),
- Enable modular build of the SHA-1 secure hash algorithm (no longer
auto-enabled since commit 2f3dd6ec901f29ae ("sctp: Convert cookie
authentication to use HMAC-SHA256")).
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://patch.msgid.link/65e00bcb7b2980278bb087986ee405627aa32d8b.1760360254.git.geert@linux-m68k.org
Diffstat (limited to 'arch/m68k/configs/multi_defconfig')
| -rw-r--r-- | arch/m68k/configs/multi_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 301a05c12577..f0d0d120e144 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig @@ -279,7 +279,6 @@ CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m CONFIG_BRIDGE_EBT_NFLOG=m CONFIG_IP_SCTP=m -CONFIG_SCTP_COOKIE_HMAC_SHA1=y CONFIG_RDS=m CONFIG_RDS_TCP=m CONFIG_L2TP=m @@ -295,7 +294,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m CONFIG_DNS_RESOLVER=y CONFIG_BATMAN_ADV=m # CONFIG_BATMAN_ADV_BATMAN_V is not set -CONFIG_BATMAN_ADV_NC=y CONFIG_NETLINK_DIAG=m CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m @@ -646,6 +644,7 @@ CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_SHA1=m CONFIG_CRYPTO_SM3_GENERIC=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_XCBC=m |