linux-next: manual merge of the mm tree with the kvm-arm-fixes tree

linux-next: manual merge of the mm tree with the kvm-arm-fixes tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1887 bytes --]

Hi all,

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

  arch/arm64/kvm/mmu.c

between commit:

  bc502b86a3cfd ("KVM: arm64: Use stage-1 leaf size for VM_PFNMAP")

from the kvm-arm-fixes tree and commits:

  8d9cb659cbf21 ("mm: rename is_vm_hugetlb_page() to vma_is_hugetlb()")
  56104155616d5 ("mm: drop some redundant checks around hugetlb VMAs")

from the mm 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.

diff --cc arch/arm64/kvm/mmu.c
index bf6d6526639fa,73c8492e85c4e..0000000000000
--- 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;
  }
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]