Commit 03feb7c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68k-for-v5.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven:

 - A small comma vs semicolon cleanup

 - defconfig updates

* tag 'm68k-for-v5.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: defconfig: Update defconfigs for v5.15-rc1
  m68k: muldi3: Use semicolon instead of comma
parents 552ebfe0 8a3c0a74

arch/m68k/configs/amiga_defconfig

+5 −2
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ CONFIG_MPLS_ROUTING=m 
CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_AF_KCM=m

CONFIG_MCTP=m

# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m

CONFIG_NET_IFE=m
@@ -474,6 +475,8 @@ CONFIG_UDF_FS=m 
CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_EXFAT_FS=m

CONFIG_NTFS3_FS=m

CONFIG_NTFS3_LZX_XPRESS=y

CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y
@@ -580,6 +583,7 @@ CONFIG_CRYPTO_ADIANTUM=m 
CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m
@@ -618,7 +622,6 @@ 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

CONFIG_TEST_LOCKUP=m
@@ -627,12 +630,12 @@ CONFIG_EARLY_PRINTK=y 
CONFIG_KUNIT=m

CONFIG_KUNIT_ALL_TESTS=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_TEST_DIV64=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

arch/m68k/configs/apollo_defconfig

+5 −2
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ CONFIG_MPLS_ROUTING=m 
CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_AF_KCM=m

CONFIG_MCTP=m

# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m

CONFIG_NET_IFE=m
@@ -431,6 +432,8 @@ CONFIG_UDF_FS=m 
CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_EXFAT_FS=m

CONFIG_NTFS3_FS=m

CONFIG_NTFS3_LZX_XPRESS=y

CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y
@@ -537,6 +540,7 @@ CONFIG_CRYPTO_ADIANTUM=m 
CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m
@@ -574,7 +578,6 @@ CONFIG_PRIME_NUMBERS=m 
CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

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
@@ -583,12 +586,12 @@ CONFIG_EARLY_PRINTK=y 
CONFIG_KUNIT=m

CONFIG_KUNIT_ALL_TESTS=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_TEST_DIV64=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

arch/m68k/configs/atari_defconfig

+5 −2
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ CONFIG_MPLS_ROUTING=m 
CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_AF_KCM=m

CONFIG_MCTP=m

# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m

CONFIG_NET_IFE=m
@@ -452,6 +453,8 @@ CONFIG_UDF_FS=m 
CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_EXFAT_FS=m

CONFIG_NTFS3_FS=m

CONFIG_NTFS3_LZX_XPRESS=y

CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y
@@ -558,6 +561,7 @@ CONFIG_CRYPTO_ADIANTUM=m 
CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m
@@ -596,7 +600,6 @@ 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

CONFIG_TEST_LOCKUP=m
@@ -605,12 +608,12 @@ CONFIG_EARLY_PRINTK=y 
CONFIG_KUNIT=m

CONFIG_KUNIT_ALL_TESTS=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_TEST_DIV64=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

arch/m68k/configs/bvme6000_defconfig

+5 −2
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ CONFIG_MPLS_ROUTING=m 
CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_AF_KCM=m

CONFIG_MCTP=m

# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m

CONFIG_NET_IFE=m
@@ -424,6 +425,8 @@ CONFIG_UDF_FS=m 
CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_EXFAT_FS=m

CONFIG_NTFS3_FS=m

CONFIG_NTFS3_LZX_XPRESS=y

CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y
@@ -530,6 +533,7 @@ CONFIG_CRYPTO_ADIANTUM=m 
CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m
@@ -567,7 +571,6 @@ CONFIG_PRIME_NUMBERS=m 
CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

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
@@ -576,12 +579,12 @@ CONFIG_EARLY_PRINTK=y 
CONFIG_KUNIT=m

CONFIG_KUNIT_ALL_TESTS=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_TEST_DIV64=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m

arch/m68k/configs/hp300_defconfig

+5 −2
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ CONFIG_MPLS_ROUTING=m 
CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_AF_KCM=m

CONFIG_MCTP=m

# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m

CONFIG_NET_IFE=m
@@ -433,6 +434,8 @@ CONFIG_UDF_FS=m 
CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_EXFAT_FS=m

CONFIG_NTFS3_FS=m

CONFIG_NTFS3_LZX_XPRESS=y

CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y
@@ -539,6 +542,7 @@ CONFIG_CRYPTO_ADIANTUM=m 
CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m
@@ -576,7 +580,6 @@ CONFIG_PRIME_NUMBERS=m 
CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

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
@@ -585,12 +588,12 @@ CONFIG_EARLY_PRINTK=y 
CONFIG_KUNIT=m

CONFIG_KUNIT_ALL_TESTS=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_TEST_DIV64=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_STRSCPY=m

CONFIG_TEST_KSTRTOX=m