Hi all,

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

  arch/arm64/include/asm/tlb.h

between commit:

  55d2a0bd5ead ("mm: add statistics for PUD level pagetable")

from the mm-stable tree and commit:

  3399ee709734 ("arm64: mm: Add support for folding PUDs at runtime")

from the arm64 tree.

Thanks, Catalin for the heads up, I just used your resolution.

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/tlb.h
index 846c563689a8,771077f34a6c..000000000000
--- a/arch/arm64/include/asm/tlb.h
+++ b/arch/arm64/include/asm/tlb.h
@@@ -96,10 -96,8 +96,12 @@@ static inline void __pmd_free_tlb(struc
  static inline void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pudp,
  				  unsigned long addr)
  {
- 	struct ptdesc *ptdesc = virt_to_ptdesc(pudp);
 -	if (pgtable_l4_enabled())
 -		tlb_remove_ptdesc(tlb, virt_to_ptdesc(pudp));
++	if (pgtable_l4_enabled()) {
++		struct ptdesc *ptdesc = virt_to_ptdesc(pudp);
 +
- 	pagetable_pud_dtor(ptdesc);
- 	tlb_remove_ptdesc(tlb, ptdesc);
++		pagetable_pud_dtor(ptdesc);
++		tlb_remove_ptdesc(tlb, ptdesc);
++	}
  }
  #endif