Commit f7301270 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull m68k updates from Geert Uytterhoeven:

 - defconfig updates

 - miscellaneous fixes and improvements

* tag 'm68k-for-v6.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: kexec: Include <linux/reboot.h>
  m68k: defconfig: Update defconfigs for v6.3-rc1
  m68k: Remove obsolete config NO_KERNEL_MSG
  nubus: Drop noop match function
parents 173ea743 aaee8c7f

arch/m68k/Kconfig.debug

+0 −5
Original line number Diff line number Diff line
@@ -36,11 +36,6 @@ config HIGHPROFILE 
	help

	  Use a fast secondary clock to produce profiling information.



config NO_KERNEL_MSG

	bool "Suppress Kernel BUG Messages"

	help

	  Do not output any debug BUG messages within the kernel.



config BDM_DISABLE

	bool "Disable BDM signals"

	depends on COLDFIRE

arch/m68k/configs/amiga_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -214,7 +214,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m 
CONFIG_IP_NF_TARGET_NETMAP=m

CONFIG_IP_NF_TARGET_REDIRECT=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_CLUSTERIP=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m
@@ -495,6 +494,7 @@ CONFIG_NFS_V4=m 
CONFIG_NFS_SWAP=y

CONFIG_ROOT_NFS=y

CONFIG_NFSD=m

CONFIG_RPCSEC_GSS_KRB5=m

CONFIG_CIFS=m

# CONFIG_CIFS_STATS2 is not set

# CONFIG_CIFS_DEBUG is not set
@@ -621,6 +621,7 @@ CONFIG_WW_MUTEX_SELFTEST=m 
CONFIG_EARLY_PRINTK=y

CONFIG_KUNIT=m

CONFIG_KUNIT_ALL_TESTS=m

CONFIG_TEST_DHRY=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_DIV64=m

CONFIG_REED_SOLOMON_TEST=m

arch/m68k/configs/apollo_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -210,7 +210,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m 
CONFIG_IP_NF_TARGET_NETMAP=m

CONFIG_IP_NF_TARGET_REDIRECT=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_CLUSTERIP=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m
@@ -452,6 +451,7 @@ CONFIG_NFS_V4=m 
CONFIG_NFS_SWAP=y

CONFIG_ROOT_NFS=y

CONFIG_NFSD=m

CONFIG_RPCSEC_GSS_KRB5=m

CONFIG_CIFS=m

# CONFIG_CIFS_STATS2 is not set

# CONFIG_CIFS_DEBUG is not set
@@ -577,6 +577,7 @@ CONFIG_WW_MUTEX_SELFTEST=m 
CONFIG_EARLY_PRINTK=y

CONFIG_KUNIT=m

CONFIG_KUNIT_ALL_TESTS=m

CONFIG_TEST_DHRY=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_DIV64=m

CONFIG_REED_SOLOMON_TEST=m

arch/m68k/configs/atari_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m 
CONFIG_IP_NF_TARGET_NETMAP=m

CONFIG_IP_NF_TARGET_REDIRECT=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_CLUSTERIP=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m
@@ -472,6 +471,7 @@ CONFIG_NFS_V4=m 
CONFIG_NFS_SWAP=y

CONFIG_ROOT_NFS=y

CONFIG_NFSD=m

CONFIG_RPCSEC_GSS_KRB5=m

CONFIG_CIFS=m

# CONFIG_CIFS_STATS2 is not set

# CONFIG_CIFS_DEBUG is not set
@@ -598,6 +598,7 @@ CONFIG_WW_MUTEX_SELFTEST=m 
CONFIG_EARLY_PRINTK=y

CONFIG_KUNIT=m

CONFIG_KUNIT_ALL_TESTS=m

CONFIG_TEST_DHRY=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_DIV64=m

CONFIG_REED_SOLOMON_TEST=m

arch/m68k/configs/bvme6000_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m 
CONFIG_IP_NF_TARGET_NETMAP=m

CONFIG_IP_NF_TARGET_REDIRECT=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_CLUSTERIP=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m
@@ -444,6 +443,7 @@ CONFIG_NFS_V4=m 
CONFIG_NFS_SWAP=y

CONFIG_ROOT_NFS=y

CONFIG_NFSD=m

CONFIG_RPCSEC_GSS_KRB5=m

CONFIG_CIFS=m

# CONFIG_CIFS_STATS2 is not set

# CONFIG_CIFS_DEBUG is not set
@@ -569,6 +569,7 @@ CONFIG_WW_MUTEX_SELFTEST=m 
CONFIG_EARLY_PRINTK=y

CONFIG_KUNIT=m

CONFIG_KUNIT_ALL_TESTS=m

CONFIG_TEST_DHRY=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_DIV64=m

CONFIG_REED_SOLOMON_TEST=m