diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2020-04-13 12:41:53 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2020-05-11 10:50:03 +0200 |
| commit | b5c08eb306abe5f00bee7220e8d3b62040edf28e (patch) | |
| tree | 70db0957f46f091ae8c83e292d716d651a75df40 /arch/m68k/configs/q40_defconfig | |
| parent | 366b8149fbff1965f9e25bb27dd4698d654be270 (diff) | |
| download | linux-b5c08eb306abe5f00bee7220e8d3b62040edf28e.tar.bz2 | |
m68k: defconfig: Update defconfigs for v5.7-rc1
- Enable modular build of Bare UDP Encapsulation, exFAT filesystem
support, and lockup and min heap test modules,
- Remove CONFIG_NF_TABLES_SET=m (removed in commit e32a4dc6512ce3c1
("netfilter: nf_tables: make sets built-in")),
- Disable CONFIG_VHOST_MENU (should default to n).
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20200413104153.30517-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, 5 insertions, 1 deletions
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 3dd5b536921e..2cbf416fc725 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig @@ -94,7 +94,6 @@ CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_TABLES=m -CONFIG_NF_TABLES_SET=m CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_NETDEV=y CONFIG_NFT_NUMGEN=m @@ -365,6 +364,7 @@ CONFIG_IPVLAN=m CONFIG_IPVTAP=m CONFIG_VXLAN=m CONFIG_GENEVE=m +CONFIG_BAREUDP=m CONFIG_GTP=m CONFIG_MACSEC=m CONFIG_NETCONSOLE=m @@ -419,6 +419,7 @@ CONFIG_RTC_CLASS=y # CONFIG_RTC_NVMEM is not set CONFIG_RTC_DRV_GENERIC=m # CONFIG_VIRTIO_MENU is not set +# CONFIG_VHOST_MENU is not set # CONFIG_IOMMU_SUPPORT is not set CONFIG_DAX=m CONFIG_EXT4_FS=y @@ -439,6 +440,7 @@ CONFIG_ZISOFS=y CONFIG_UDF_FS=m CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=m +CONFIG_EXFAT_FS=m CONFIG_PROC_KCORE=y CONFIG_PROC_CHILDREN=y CONFIG_TMPFS=y @@ -586,9 +588,11 @@ CONFIG_XZ_DEC_TEST=m CONFIG_STRING_SELFTEST=m # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=y +CONFIG_TEST_LOCKUP=m CONFIG_WW_MUTEX_SELFTEST=m CONFIG_EARLY_PRINTK=y CONFIG_TEST_LIST_SORT=m +CONFIG_TEST_MIN_HEAP=m CONFIG_TEST_SORT=m CONFIG_REED_SOLOMON_TEST=m CONFIG_ATOMIC64_SELFTEST=m |