Commit 1ea3bb3e authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k: defconfig: Update defconfigs for v6.3-rc1 



  - Drop CONFIG_IP_NF_TARGET_CLUSTERIP=m (removed in commit
    9db5d918 ("netfilter: ip_tables: remove clusterip target")),
  - Enable modular build of the Kerberos V mechanism for Secure RPC
    (auto-builtin since commit dfe9a123 ("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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/2b6d1357f4cb7e23bb2c7a7d39c4486e77e138ad.1678106848.git.geert@linux-m68k.org
parent fda1941b

arch/m68k/configs/amiga_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -214,7 +214,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
@@ -495,6 +494,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
@@ -621,6 +621,7 @@ CONFIG_WW_MUTEX_SELFTEST=m 
CONFIG_EARLY_PRINTK=y

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

arch/m68k/configs/apollo_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -210,7 +210,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
@@ -452,6 +451,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
@@ -577,6 +577,7 @@ CONFIG_WW_MUTEX_SELFTEST=m 
CONFIG_EARLY_PRINTK=y

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

arch/m68k/configs/atari_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -217,7 +217,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
@@ -472,6 +471,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
@@ -598,6 +598,7 @@ CONFIG_WW_MUTEX_SELFTEST=m 
CONFIG_EARLY_PRINTK=y

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

arch/m68k/configs/bvme6000_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -207,7 +207,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
@@ -444,6 +443,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
@@ -569,6 +569,7 @@ CONFIG_WW_MUTEX_SELFTEST=m 
CONFIG_EARLY_PRINTK=y

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

arch/m68k/configs/hp300_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -209,7 +209,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
@@ -454,6 +453,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
@@ -579,6 +579,7 @@ CONFIG_WW_MUTEX_SELFTEST=m 
CONFIG_EARLY_PRINTK=y

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