linux-next: manual merge of the akpm-current tree with the kspp tree

[Stephen Rothwell]

Hi all,

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

  arch/Kconfig

between commit:

  5a3a47bf8367 ("orphans: Hoist '--orphan-handling' into Kconfig")

from the kspp tree and commits:

  84d8b3661cc9 ("arm, arm64: move free_unused_memmap() to generic mm")
  46b9b00649f6 ("arch, mm: restore dependency of __kernel_map_pages() on DEBUG_PAGEALLOC")

from the akpm-current 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 arch/Kconfig
index 313b2bc0c475,9ebdab3d0ca2..000000000000
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@@ -1062,15 -1035,12 +1069,21 @@@ config HAVE_STATIC_CALL_INLIN
  	bool
  	depends on HAVE_STATIC_CALL
  
 +config ARCH_WANT_LD_ORPHAN_WARN
 +	bool
 +	help
 +	  An arch should select this symbol once all linker sections are explicitly
 +	  included, size-asserted, or discarded in the linker scripts. This is
 +	  important because we never want expected sections to be placed heuristically
 +	  by the linker, since the locations of such sections can change between linker
 +	  versions.
 +
+ config HAVE_ARCH_PFN_VALID
+ 	bool
+ 
+ config ARCH_SUPPORTS_DEBUG_PAGEALLOC
+ 	bool
+ 
  source "kernel/gcov/Kconfig"
  
  source "scripts/gcc-plugins/Kconfig"

Attachment: pgp7cjHIeqebd.pgp
Description: OpenPGP digital signature