linux-next: manual merge of the tip tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  lib/Kconfig.debug

between commit:

  045f6d7942be ("lib/Kconfig.debug: fix some messed up configurations")

from Linus' tree and commit:

  dfd402a4c4ba ("kcsan: Add Kernel Concurrency Sanitizer infrastructure")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc lib/Kconfig.debug
index 5ffe144c9794,bee08ed4a139..000000000000
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -447,6 -447,6 +447,8 @@@ source "lib/Kconfig.kgdb
  
  source "lib/Kconfig.ubsan"
  
++source "lib/Kconfig.kcsan"
++
  endmenu
  
  config DEBUG_KERNEL
@@@ -2175,8 -2130,55 +2177,6 @@@ config MEMTES
  	        memtest=17, mean do 17 test patterns.
  	  If you are unsure how to answer this question, answer N.
  
 -source "samples/Kconfig"
 -
 -source "lib/Kconfig.kcsan"
 -
 -config ARCH_HAS_DEVMEM_IS_ALLOWED
 -	bool
 -
 -config STRICT_DEVMEM
 -	bool "Filter access to /dev/mem"
 -	depends on MMU && DEVMEM
 -	depends on ARCH_HAS_DEVMEM_IS_ALLOWED
 -	default y if PPC || X86 || ARM64
 -	---help---
 -	  If this option is disabled, you allow userspace (root) access to all
 -	  of memory, including kernel and userspace memory. Accidental
 -	  access to this is obviously disastrous, but specific access can
 -	  be used by people debugging the kernel. Note that with PAT support
 -	  enabled, even in this case there are restrictions on /dev/mem
 -	  use due to the cache aliasing requirements.
 -
 -	  If this option is switched on, and IO_STRICT_DEVMEM=n, the /dev/mem
 -	  file only allows userspace access to PCI space and the BIOS code and
 -	  data regions.  This is sufficient for dosemu and X and all common
 -	  users of /dev/mem.
 -
 -	  If in doubt, say Y.
 -
 -config IO_STRICT_DEVMEM
 -	bool "Filter I/O access to /dev/mem"
 -	depends on STRICT_DEVMEM
 -	---help---
 -	  If this option is disabled, you allow userspace (root) access to all
 -	  io-memory regardless of whether a driver is actively using that
 -	  range.  Accidental access to this is obviously disastrous, but
 -	  specific access can be used by people debugging kernel drivers.
 -
 -	  If this option is switched on, the /dev/mem file only allows
 -	  userspace access to *idle* io-memory ranges (see /proc/iomem) This
 -	  may break traditional users of /dev/mem (dosemu, legacy X, etc...)
 -	  if the driver using a given range cannot be disabled.
 -
 -	  If in doubt, say Y.
 -
 -menu "$(SRCARCH) Debugging"
 -
 -source "arch/$(SRCARCH)/Kconfig.debug"
--
 -endmenu
--
  config HYPERV_TESTING
  	bool "Microsoft Hyper-V driver testing"
  	default n

Attachment: pgpHu5XivrdU1.pgp
Description: OpenPGP digital signature