Commit b5c08eb3 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

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 e32a4dc6
    ("netfilter: nf_tables: make sets built-in")),
  - Disable CONFIG_VHOST_MENU (should default to n).

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

arch/m68k/configs/amiga_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -100,7 +100,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
@@ -381,6 +380,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
@@ -452,6 +452,7 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_MSM6242=m

CONFIG_RTC_DRV_RP5C01=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
@@ -472,6 +473,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
@@ -619,9 +621,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

arch/m68k/configs/apollo_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -96,7 +96,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
@@ -360,6 +359,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
@@ -408,6 +408,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
@@ -428,6 +429,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
@@ -575,9 +577,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

arch/m68k/configs/atari_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -103,7 +103,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
@@ -376,6 +375,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
@@ -430,6 +430,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
@@ -450,6 +451,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
@@ -597,9 +599,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

arch/m68k/configs/bvme6000_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -93,7 +93,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
@@ -358,6 +357,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
@@ -401,6 +401,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
@@ -421,6 +422,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
@@ -568,9 +570,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

arch/m68k/configs/hp300_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -95,7 +95,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
@@ -359,6 +358,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
@@ -410,6 +410,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
@@ -430,6 +431,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
@@ -577,9 +579,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