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

Commit 241e5e6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull m68k updates from Geert Uytterhoeven:

  - NuBus improvements and cleanups

  - defconfig updates

  - Fix debugger syscall restart interactions, leading to the global
    removal of ptrace_signal_deliver()

* tag 'm68k-for-v4.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Remove ptrace_signal_deliver
  m68k/defconfig: Update defconfigs for v4.12-rc1
  nubus: Fix pointer validation
  nubus: Remove slot zero probe
parents 7a69f9c6 204a2be3

arch/m68k/configs/amiga_defconfig

+7 −1
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ CONFIG_SUN_PARTITION=y 
CONFIG_SYSV68_PARTITION=y

CONFIG_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m

CONFIG_KEXEC=y

CONFIG_BOOTINFO_PROC=y

CONFIG_M68020=y
@@ -349,7 +351,6 @@ CONFIG_SCSI_A4000T=y 
CONFIG_SCSI_ZORRO7XX=y

CONFIG_MD=y

CONFIG_MD_LINEAR=m

CONFIG_MD_RAID0=m

CONFIG_BLK_DEV_DM=m

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m
@@ -361,6 +362,7 @@ CONFIG_DM_ZERO=m 
CONFIG_DM_MULTIPATH=m

CONFIG_DM_UEVENT=y

CONFIG_DM_LOG_WRITES=m

CONFIG_DM_INTEGRITY=m

CONFIG_TARGET_CORE=m

CONFIG_TCM_IBLOCK=m

CONFIG_TCM_FILEIO=m
@@ -414,6 +416,7 @@ CONFIG_ZORRO8390=y 
# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

CONFIG_PPP=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_DEFLATE=m
@@ -572,6 +575,8 @@ CONFIG_DLM=m 
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m
@@ -590,6 +595,7 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

arch/m68k/configs/apollo_defconfig

+7 −1
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ CONFIG_SUN_PARTITION=y 
CONFIG_SYSV68_PARTITION=y

CONFIG_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m

CONFIG_KEXEC=y

CONFIG_BOOTINFO_PROC=y

CONFIG_M68020=y
@@ -331,7 +333,6 @@ CONFIG_ISCSI_TCP=m 
CONFIG_ISCSI_BOOT_SYSFS=m

CONFIG_MD=y

CONFIG_MD_LINEAR=m

CONFIG_MD_RAID0=m

CONFIG_BLK_DEV_DM=m

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m
@@ -343,6 +344,7 @@ CONFIG_DM_ZERO=m 
CONFIG_DM_MULTIPATH=m

CONFIG_DM_UEVENT=y

CONFIG_DM_LOG_WRITES=m

CONFIG_DM_INTEGRITY=m

CONFIG_TARGET_CORE=m

CONFIG_TCM_IBLOCK=m

CONFIG_TCM_FILEIO=m
@@ -388,6 +390,7 @@ CONFIG_VETH=m 
# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

CONFIG_PPP=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_DEFLATE=m
@@ -531,6 +534,8 @@ CONFIG_DLM=m 
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m
@@ -549,6 +554,7 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

arch/m68k/configs/atari_defconfig

+7 −1
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ CONFIG_SUN_PARTITION=y 
CONFIG_SYSV68_PARTITION=y

CONFIG_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m

CONFIG_KEXEC=y

CONFIG_BOOTINFO_PROC=y

CONFIG_M68020=y
@@ -340,7 +342,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m 
CONFIG_ATARI_SCSI=y

CONFIG_MD=y

CONFIG_MD_LINEAR=m

CONFIG_MD_RAID0=m

CONFIG_BLK_DEV_DM=m

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m
@@ -352,6 +353,7 @@ CONFIG_DM_ZERO=m 
CONFIG_DM_MULTIPATH=m

CONFIG_DM_UEVENT=y

CONFIG_DM_LOG_WRITES=m

CONFIG_DM_INTEGRITY=m

CONFIG_TARGET_CORE=m

CONFIG_TCM_IBLOCK=m

CONFIG_TCM_FILEIO=m
@@ -399,6 +401,7 @@ CONFIG_SMC91X=y 
# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

CONFIG_PPP=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_DEFLATE=m
@@ -552,6 +555,8 @@ CONFIG_DLM=m 
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m
@@ -570,6 +575,7 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

arch/m68k/configs/bvme6000_defconfig

+7 −1
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ CONFIG_SUN_PARTITION=y 
# CONFIG_EFI_PARTITION is not set

CONFIG_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m

CONFIG_KEXEC=y

CONFIG_BOOTINFO_PROC=y

CONFIG_M68040=y
@@ -330,7 +332,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m 
CONFIG_BVME6000_SCSI=y

CONFIG_MD=y

CONFIG_MD_LINEAR=m

CONFIG_MD_RAID0=m

CONFIG_BLK_DEV_DM=m

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m
@@ -342,6 +343,7 @@ CONFIG_DM_ZERO=m 
CONFIG_DM_MULTIPATH=m

CONFIG_DM_UEVENT=y

CONFIG_DM_LOG_WRITES=m

CONFIG_DM_INTEGRITY=m

CONFIG_TARGET_CORE=m

CONFIG_TCM_IBLOCK=m

CONFIG_TCM_FILEIO=m
@@ -387,6 +389,7 @@ CONFIG_BVME6000_NET=y 
# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

CONFIG_PPP=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_DEFLATE=m
@@ -523,6 +526,8 @@ CONFIG_DLM=m 
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m
@@ -541,6 +546,7 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

arch/m68k/configs/hp300_defconfig

+7 −1
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ CONFIG_SUN_PARTITION=y 
CONFIG_SYSV68_PARTITION=y

CONFIG_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m

CONFIG_KEXEC=y

CONFIG_BOOTINFO_PROC=y

CONFIG_M68020=y
@@ -331,7 +333,6 @@ CONFIG_ISCSI_TCP=m 
CONFIG_ISCSI_BOOT_SYSFS=m

CONFIG_MD=y

CONFIG_MD_LINEAR=m

CONFIG_MD_RAID0=m

CONFIG_BLK_DEV_DM=m

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m
@@ -343,6 +344,7 @@ CONFIG_DM_ZERO=m 
CONFIG_DM_MULTIPATH=m

CONFIG_DM_UEVENT=y

CONFIG_DM_LOG_WRITES=m

CONFIG_DM_INTEGRITY=m

CONFIG_TARGET_CORE=m

CONFIG_TCM_IBLOCK=m

CONFIG_TCM_FILEIO=m
@@ -389,6 +391,7 @@ CONFIG_HPLANCE=y 
# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

CONFIG_PPP=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_DEFLATE=m
@@ -533,6 +536,8 @@ CONFIG_DLM=m 
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m
@@ -551,6 +556,7 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m