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

[Mark Brown]

Hi all,

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

  arch/x86/kvm/mmu/mmu.c

between commit:

  26505e1b5b546 ("KVM: SVM: make svm_flush_tlb_gva do a full asid flush if NPT enabled")

from the kvm-fixes tree and commits:

  148fe965df16a ("KVM: x86/mmu: unify root_gva_walk and ngva_walk")
  0a59a8b8a248e ("KVM: x86/mmu: pull struct kvm_pagewalk out of struct kvm_mmu")

from the kvm 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/x86/kvm/mmu/mmu.c
index c9e4739b26d71,6c13da942bfcc..0000000000000
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@@ -6652,9 -6672,17 +6695,17 @@@ void kvm_mmu_invalidate_addr(struct kvm
  		if (is_noncanonical_invlpg_address(addr, vcpu))
  			return;
  
 -		kvm_x86_call(flush_tlb_gva)(vcpu, addr);
 +		kvm_x86_call(flush_tlb_gva)(vcpu, addr, NULL);
+ 
+ 		if (tdp_enabled)
+ 			return;
+ 
+ 		mmu = &vcpu->arch.root_mmu;
+ 	} else {
+ 		mmu = &vcpu->arch.guest_mmu;
  	}
  
+ 	/* Invalidate shadow pages, whether GPA->GVA or nGPA->GPA.  */
  	if (!mmu->sync_spte)
  		return;

Attachment: signature.asc
Description: PGP signature