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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 29 Apr 2020 16:53:28 +1000

Hi all,

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

  arch/arm64/include/asm/pgtable.h

between commit:

  68ecabd0e680 ("arm64/mm: Use phys_to_page() to access pgtable memory")

from the arm64 tree and commit:

  22998131ab33 ("arm64: add support for folded p4d page tables")

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/include/asm/pgtable.h
index 5caff09c6a3a,ef7145c3b96b..000000000000
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@@ -622,10 -632,10 +633,10 @@@ static inline phys_addr_t p4d_page_padd
  #define pud_offset(dir, addr)		((pud_t *)__va(pud_offset_phys((dir), (addr))))
  
  #define pud_set_fixmap(addr)		((pud_t *)set_fixmap_offset(FIX_PUD, addr))
- #define pud_set_fixmap_offset(pgd, addr)	pud_set_fixmap(pud_offset_phys(pgd, addr))
+ #define pud_set_fixmap_offset(p4d, addr)	pud_set_fixmap(pud_offset_phys(p4d, addr))
  #define pud_clear_fixmap()		clear_fixmap(FIX_PUD)
  
- #define pgd_page(pgd)			phys_to_page(__pgd_to_phys(pgd))
 -#define p4d_page(p4d)		pfn_to_page(__phys_to_pfn(__p4d_to_phys(p4d)))
++#define p4d_page(p4d)			phys_to_page(__p4d_to_phys(p4d))
  
  /* use ONLY for statically allocated translation tables */
  #define pud_offset_kimg(dir,addr)	((pud_t *)__phys_to_kimg(pud_offset_phys((dir), (addr))))