linux-next: manual merge of the akpm-current tree with the kvm-arm tree

linux-next: manual merge of the akpm-current tree with the kvm-arm tree

[Stephen Rothwell]

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

Hi all,

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

  arch/arm64/kvm/mmu.c

between commit:

  70fb2fa12176 ("KVM: arm/arm64: Release kvm->mmu_lock in loop to prevent starvation")

from the kvm-arm tree and commit:

  72ff958aa971 ("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/kvm/mmu.c
index ddf85bf21897,534d9798c3cb..000000000000
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@@ -421,10 -469,7 +469,10 @@@ static void stage2_flush_memslot(struc
  	do {
  		next = stage2_pgd_addr_end(kvm, addr, end);
  		if (!stage2_pgd_none(kvm, *pgd))
- 			stage2_flush_puds(kvm, pgd, addr, next);
+ 			stage2_flush_p4ds(kvm, pgd, addr, next);
 +
 +		if (next != end)
 +			cond_resched_lock(&kvm->mmu_lock);
  	} while (pgd++, addr = next, addr != end);
  }
  

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