Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5142ef1c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/mac: Fix out-of-bounds array index in OSS IRQ source initialization
  m68k/pci: Remove a superflous KERN_ERR
  m68k/defconfig: Update defconfigs for v4.0-rc1
  m68k/q40: Make NE2000 builtin instead of modular
  m68k: Remove FSF address
parents 6a16dda8 b24f670b

arch/m68k/configs/amiga_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -521,8 +521,10 @@ CONFIG_NLS_MAC_TURKISH=m 
CONFIG_DLM=m

CONFIG_MAGIC_SYSRQ=y

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m
@@ -573,5 +575,6 @@ CONFIG_CRYPTO_DRBG_HASH=y 
CONFIG_CRYPTO_DRBG_CTR=y

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

# CONFIG_CRYPTO_HW is not set

CONFIG_XZ_DEC_TEST=m

arch/m68k/configs/apollo_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -479,8 +479,10 @@ CONFIG_NLS_MAC_TURKISH=m 
CONFIG_DLM=m

CONFIG_MAGIC_SYSRQ=y

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m
@@ -531,5 +533,6 @@ CONFIG_CRYPTO_DRBG_HASH=y 
CONFIG_CRYPTO_DRBG_CTR=y

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

# CONFIG_CRYPTO_HW is not set

CONFIG_XZ_DEC_TEST=m

arch/m68k/configs/atari_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -501,8 +501,10 @@ CONFIG_NLS_MAC_TURKISH=m 
CONFIG_DLM=m

CONFIG_MAGIC_SYSRQ=y

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m
@@ -553,5 +555,6 @@ CONFIG_CRYPTO_DRBG_HASH=y 
CONFIG_CRYPTO_DRBG_CTR=y

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

# CONFIG_CRYPTO_HW is not set

CONFIG_XZ_DEC_TEST=m

arch/m68k/configs/bvme6000_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -472,8 +472,10 @@ CONFIG_NLS_MAC_TURKISH=m 
CONFIG_DLM=m

CONFIG_MAGIC_SYSRQ=y

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m
@@ -524,5 +526,6 @@ CONFIG_CRYPTO_DRBG_HASH=y 
CONFIG_CRYPTO_DRBG_CTR=y

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

# CONFIG_CRYPTO_HW is not set

CONFIG_XZ_DEC_TEST=m

arch/m68k/configs/hp300_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -481,8 +481,10 @@ CONFIG_NLS_MAC_TURKISH=m 
CONFIG_DLM=m

CONFIG_MAGIC_SYSRQ=y

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m
@@ -533,5 +535,6 @@ CONFIG_CRYPTO_DRBG_HASH=y 
CONFIG_CRYPTO_DRBG_CTR=y

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

# CONFIG_CRYPTO_HW is not set

CONFIG_XZ_DEC_TEST=m