diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2021-07-12 14:04:56 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2021-08-09 13:23:40 +0200 |
| commit | 07aa6c73e7c670c1917e3b2447e8f1b4c236315e (patch) | |
| tree | e69f6c78176a85943fd95a2ab5e316655d6a0406 /arch/m68k/configs/q40_defconfig | |
| parent | m68k: emu: Fix invalid free in nfeth_cleanup() (diff) | |
| download | linux-07aa6c73e7c670c1917e3b2447e8f1b4c236315e.tar.xz linux-07aa6c73e7c670c1917e3b2447e8f1b4c236315e.zip | |
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
b90257bfddbd01f3 ("m68k: use libata instead of the legacy ide
driver")),
- Disable CIFS_STATS2 (defaults to enabled since commit
0d52df81e07739db ("cifs: enable extended stats by default")),
- Enable modular build of the glob self-test (visible since commit
b90257bfddbd01f3 ("m68k: use libata instead of the legacy ide
driver")),
- Drop CONFIG_TEST_LIST_SORT=m (auto-enabled since commit
ebd09577be6c15ee ("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: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20210712120456.4119260-1-geert@linux-m68k.org
Diffstat (limited to 'arch/m68k/configs/q40_defconfig')
| -rw-r--r-- | arch/m68k/configs/q40_defconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 0e15431b65e2..1993433d0840 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig @@ -78,6 +78,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 @@ -314,7 +315,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 @@ -469,6 +469,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 @@ -583,6 +584,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 @@ -591,7 +593,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 @@ -603,6 +604,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 |