Commit 07aa6c73 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k: defconfig: Update defconfigs for v5.14-rc1 



  - Enable modular build of the new Netfilter base hook dump support,
  - Drop CONFIG_SCSI=y (selected by ATA, as enabled since commit
    b90257bf ("m68k: use libata instead of the legacy ide
    driver")),
  - Disable CIFS_STATS2 (defaults to enabled since commit
    0d52df81 ("cifs: enable extended stats by default")),
  - Enable modular build of the glob self-test (visible since commit
    b90257bf ("m68k: use libata instead of the legacy ide
    driver")),
  - Drop CONFIG_TEST_LIST_SORT=m (auto-enabled since commit
    ebd09577 ("lib/test: convert lib/test_list_sort.c to use
    KUnit")),
  - Enable modular build of the new test for the scanf() family of
    functions.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20210712120456.4119260-1-geert@linux-m68k.org
parent 761608f5

arch/m68k/configs/amiga_defconfig

+4 −2
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ CONFIG_IPV6_ILA=m 
CONFIG_IPV6_VTI=m

CONFIG_IPV6_GRE=m

CONFIG_NETFILTER=y

CONFIG_NETFILTER_NETLINK_HOOK=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set
@@ -323,7 +324,6 @@ CONFIG_CDROM_PKTCDVD=m 
CONFIG_ATA_OVER_ETH=m

CONFIG_DUMMY_IRQ=m

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_BLK_DEV_SR=y
@@ -502,6 +502,7 @@ CONFIG_ROOT_NFS=y 
CONFIG_NFSD=m

CONFIG_NFSD_V3=y

CONFIG_CIFS=m

# CONFIG_CIFS_STATS2 is not set

# CONFIG_CIFS_DEBUG is not set

CONFIG_CODA_FS=m

CONFIG_NLS_CODEPAGE_437=y
@@ -616,6 +617,7 @@ CONFIG_PRIME_NUMBERS=m 
CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CONFIG_XZ_DEC_TEST=m

CONFIG_GLOB_SELFTEST=m

CONFIG_STRING_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y
@@ -624,7 +626,6 @@ CONFIG_WW_MUTEX_SELFTEST=m 
CONFIG_EARLY_PRINTK=y

CONFIG_KUNIT=m

CONFIG_KUNIT_ALL_TESTS=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_TEST_DIV64=m
@@ -636,6 +637,7 @@ CONFIG_TEST_STRING_HELPERS=m 
CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

arch/m68k/configs/apollo_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ CONFIG_IPV6_ILA=m 
CONFIG_IPV6_VTI=m

CONFIG_IPV6_GRE=m

CONFIG_NETFILTER=y

CONFIG_NETFILTER_NETLINK_HOOK=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set
@@ -458,6 +459,7 @@ CONFIG_ROOT_NFS=y 
CONFIG_NFSD=m

CONFIG_NFSD_V3=y

CONFIG_CIFS=m

# CONFIG_CIFS_STATS2 is not set

# CONFIG_CIFS_DEBUG is not set

CONFIG_CODA_FS=m

CONFIG_NLS_CODEPAGE_437=y
@@ -580,7 +582,6 @@ CONFIG_WW_MUTEX_SELFTEST=m 
CONFIG_EARLY_PRINTK=y

CONFIG_KUNIT=m

CONFIG_KUNIT_ALL_TESTS=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_TEST_DIV64=m
@@ -592,6 +593,7 @@ CONFIG_TEST_STRING_HELPERS=m 
CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

arch/m68k/configs/atari_defconfig

+4 −2
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ CONFIG_IPV6_ILA=m 
CONFIG_IPV6_VTI=m

CONFIG_IPV6_GRE=m

CONFIG_NETFILTER=y

CONFIG_NETFILTER_NETLINK_HOOK=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set
@@ -324,7 +325,6 @@ CONFIG_CDROM_PKTCDVD=m 
CONFIG_ATA_OVER_ETH=m

CONFIG_DUMMY_IRQ=m

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_BLK_DEV_SR=y
@@ -480,6 +480,7 @@ CONFIG_ROOT_NFS=y 
CONFIG_NFSD=m

CONFIG_NFSD_V3=y

CONFIG_CIFS=m

# CONFIG_CIFS_STATS2 is not set

# CONFIG_CIFS_DEBUG is not set

CONFIG_CODA_FS=m

CONFIG_NLS_CODEPAGE_437=y
@@ -594,6 +595,7 @@ CONFIG_PRIME_NUMBERS=m 
CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CONFIG_XZ_DEC_TEST=m

CONFIG_GLOB_SELFTEST=m

CONFIG_STRING_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y
@@ -602,7 +604,6 @@ CONFIG_WW_MUTEX_SELFTEST=m 
CONFIG_EARLY_PRINTK=y

CONFIG_KUNIT=m

CONFIG_KUNIT_ALL_TESTS=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_TEST_DIV64=m
@@ -614,6 +615,7 @@ CONFIG_TEST_STRING_HELPERS=m 
CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

arch/m68k/configs/bvme6000_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ CONFIG_IPV6_ILA=m 
CONFIG_IPV6_VTI=m

CONFIG_IPV6_GRE=m

CONFIG_NETFILTER=y

CONFIG_NETFILTER_NETLINK_HOOK=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set
@@ -451,6 +452,7 @@ CONFIG_ROOT_NFS=y 
CONFIG_NFSD=m

CONFIG_NFSD_V3=y

CONFIG_CIFS=m

# CONFIG_CIFS_STATS2 is not set

# CONFIG_CIFS_DEBUG is not set

CONFIG_CODA_FS=m

CONFIG_NLS_CODEPAGE_437=y
@@ -573,7 +575,6 @@ CONFIG_WW_MUTEX_SELFTEST=m 
CONFIG_EARLY_PRINTK=y

CONFIG_KUNIT=m

CONFIG_KUNIT_ALL_TESTS=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_TEST_DIV64=m
@@ -585,6 +586,7 @@ CONFIG_TEST_STRING_HELPERS=m 
CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

arch/m68k/configs/hp300_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ CONFIG_IPV6_ILA=m 
CONFIG_IPV6_VTI=m

CONFIG_IPV6_GRE=m

CONFIG_NETFILTER=y

CONFIG_NETFILTER_NETLINK_HOOK=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set
@@ -460,6 +461,7 @@ CONFIG_ROOT_NFS=y 
CONFIG_NFSD=m

CONFIG_NFSD_V3=y

CONFIG_CIFS=m

# CONFIG_CIFS_STATS2 is not set

# CONFIG_CIFS_DEBUG is not set

CONFIG_CODA_FS=m

CONFIG_NLS_CODEPAGE_437=y
@@ -582,7 +584,6 @@ CONFIG_WW_MUTEX_SELFTEST=m 
CONFIG_EARLY_PRINTK=y

CONFIG_KUNIT=m

CONFIG_KUNIT_ALL_TESTS=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_TEST_DIV64=m
@@ -594,6 +595,7 @@ CONFIG_TEST_STRING_HELPERS=m 
CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m