From 1ea3bb3e4b767d074c8215c515e959c6420908bf Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 6 Mar 2023 13:48:37 +0100 Subject: m68k: defconfig: Update defconfigs for v6.3-rc1 - Drop CONFIG_IP_NF_TARGET_CLUSTERIP=m (removed in commit 9db5d918e2c07fa0 ("netfilter: ip_tables: remove clusterip target")), - Enable modular build of the Kerberos V mechanism for Secure RPC (auto-builtin since commit dfe9a123451a6e73 ("SUNRPC: Enable rpcsec_gss_krb5.ko to be built without CRYPTO_DES")), - Enable modular build of the new Dhrystone benchmark test, - Drop accidental enablement of CONFIG_PCCARD=y in multi_defconfig. Signed-off-by: Geert Uytterhoeven Link: https://lore.kernel.org/r/2b6d1357f4cb7e23bb2c7a7d39c4486e77e138ad.1678106848.git.geert@linux-m68k.org --- arch/m68k/configs/sun3_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/m68k/configs/sun3_defconfig') diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index d4eeddac6bb8..9e3d47008f21 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig @@ -204,7 +204,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 @@ -443,6 +442,7 @@ CONFIG_NFS_V4=m CONFIG_NFS_SWAP=y CONFIG_ROOT_NFS=y CONFIG_NFSD=m +CONFIG_RPCSEC_GSS_KRB5=m CONFIG_CIFS=m # CONFIG_CIFS_STATS2 is not set # CONFIG_CIFS_DEBUG is not set @@ -567,6 +567,7 @@ CONFIG_TEST_LOCKUP=m CONFIG_WW_MUTEX_SELFTEST=m CONFIG_KUNIT=m CONFIG_KUNIT_ALL_TESTS=m +CONFIG_TEST_DHRY=m CONFIG_TEST_MIN_HEAP=m CONFIG_TEST_DIV64=m CONFIG_REED_SOLOMON_TEST=m -- cgit