linux-next: manual merge of the arm64 tree with the arm64-fixes tree

[Stephen Rothwell]

Hi all,

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

  arch/arm64/mm/hugetlbpage.c

between commit:

  0350419b14b9 ("arm64/hugetlb: fix CMA gigantic page order for non-4K PAGE_SIZE")

from the arm64-fixes tree and commit:

  f8b46c4b51ab ("arm64/mm: Add pud_sect_supported()")

from the arm64 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/mm/hugetlbpage.c
index a8158c948966,029cf5e42c4c..000000000000
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
@@@ -40,11 -40,10 +40,10 @@@ void __init arm64_hugetlb_cma_reserve(v
  {
  	int order;
  
- #ifdef CONFIG_ARM64_4K_PAGES
- 	order = PUD_SHIFT - PAGE_SHIFT;
- #else
- 	order = CONT_PMD_SHIFT - PAGE_SHIFT;
- #endif
+ 	if (pud_sect_supported())
+ 		order = PUD_SHIFT - PAGE_SHIFT;
+ 	else
 -		order = CONT_PMD_SHIFT + PMD_SHIFT - PAGE_SHIFT;
++		order = CONT_PMD_SHIFT - PAGE_SHIFT;
  	/*
  	 * HugeTLB CMA reservation is required for gigantic
  	 * huge pages which could not be allocated via the

Attachment: pgpkrGmIRk7t1.pgp
Description: OpenPGP digital signature