mm-next: manual merge of the akpm/mm-unstable branch

["David Hildenbrand (Arm)" <david@kernel.org>]

Hi,

today's mm-next merge of the akpm/mm-unstable branch tree got a conflict in:

  arch/arm64/kvm/mmu.c

between the commit:

  71cc2c67fb8f KVM: arm64: Use stage-1 leaf size for VM_PFNMAP

from Linus' tree and commits:

  7a41ed87f53f mm: drop some redundant checks around hugetlb VMAs
  f09773c2c4d0 mm: rename is_vm_hugetlb_page() to vma_is_hugetlb()

from the akpm/mm-unstable branch.

I resolved the conflicts manually:


diff --cc arch/arm64/kvm/mmu.c
index bf6d6526639f,73c8492e85c4..b0ea1a9391da
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@@ -1468,11 -1468,30 +1468,11 @@@ transparent_hugepage_adjust(struct kvm
        return PAGE_SIZE;
  }

 -static int get_vma_page_shift(struct vm_area_struct *vma, unsigned long hva)
 +static int get_vma_page_shift(struct vm_area_struct *vma)
  {
-       if (is_vm_hugetlb_page(vma))
 -      unsigned long pa;
 -
+       if (vma_is_hugetlb(vma))
                return huge_page_shift(hstate_vma(vma));

 -      if (!(vma->vm_flags & VM_PFNMAP))
 -              return PAGE_SHIFT;
 -
 -      pa = (vma->vm_pgoff << PAGE_SHIFT) + (hva - vma->vm_start);
 -
 -#ifndef __PAGETABLE_PMD_FOLDED
 -      if ((hva & (PUD_SIZE - 1)) == (pa & (PUD_SIZE - 1)) &&
 -          ALIGN_DOWN(hva, PUD_SIZE) >= vma->vm_start &&
 -          ALIGN(hva, PUD_SIZE) <= vma->vm_end)
 -              return PUD_SHIFT;
 -#endif
 -
 -      if ((hva & (PMD_SIZE - 1)) == (pa & (PMD_SIZE - 1)) &&
 -          ALIGN_DOWN(hva, PMD_SIZE) >= vma->vm_start &&
 -          ALIGN(hva, PMD_SIZE) <= vma->vm_end)
 -              return PMD_SHIFT;
 -
        return PAGE_SHIFT;
  }

-- 
Cheers,

David