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

[Stephen Rothwell]

Hi all,

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

  arch/arm64/Kconfig

between commit:

  8a695a587333 ("arm64: Kconfig: Remove ARCH_HAS_HOLES_MEMORYMODEL")

from the arm64 tree and commit:

  e1405baa7db1 ("arm: arm64: introduce CONFIG_HAVE_MEMBLOCK_PFN_VALID")

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/arm64/Kconfig
index da5e6f085561,f8a618a292f4..000000000000
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -785,7 -786,8 +785,8 @@@ config ARCH_FLATMEM_ENABL
  	def_bool !NUMA
  
  config HAVE_ARCH_PFN_VALID
 -	def_bool ARCH_HAS_HOLES_MEMORYMODEL || !SPARSEMEM
 +	def_bool y
+ 	select HAVE_MEMBLOCK_PFN_VALID
  
  config HW_PERF_EVENTS
  	def_bool y

Attachment: pgp9onWQRLF2c.pgp
Description: OpenPGP digital signature