linux-next: manual merge of the akpm-current tree with the powerpc-fixes and powerpc trees

[Stephen Rothwell]

Hi all,

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

  arch/powerpc/platforms/Kconfig.cputype

between commit:

  8adddf349fda ("powerpc/mm/radix: Make Radix require HUGETLB_PAGE")

from the powerpc-fixes tree and commits:

  1bb2bae2e6c7 ("powerpc/mm/radix: Use KUEP API for Radix MMU")
  890274c2dc4c ("powerpc/64s: Implement KUAP for Radix MMU")

from the powerpc tree and commits:

  80d5ae3cf456 ("mm: simplify MEMORY_ISOLATION && COMPACTION || CMA into CONTIG_ALLOC")
  3653abf7cded ("hugetlb: allow to free gigantic pages regardless of the configuration")

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/powerpc/platforms/Kconfig.cputype
index 00b2bb536c74,03ca91439473..000000000000
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@@ -328,10 -324,8 +328,10 @@@ config ARCH_ENABLE_SPLIT_PMD_PTLOC
  
  config PPC_RADIX_MMU
  	bool "Radix MMU Support"
 -	depends on PPC_BOOK3S_64
 +	depends on PPC_BOOK3S_64 && HUGETLB_PAGE
- 	select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA
+ 	select ARCH_HAS_GIGANTIC_PAGE
 +	select PPC_HAVE_KUEP
 +	select PPC_HAVE_KUAP
  	default y
  	help
  	  Enable support for the Power ISA 3.0 Radix style MMU. Currently this
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20190423/af618f20/attachment.sig>