Subject: linux-next: manual merge of the kvm tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 4 Jun 2018 17:04:09 +1000

Hi all,

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

  arch/x86/kvm/hyperv.c

between commit:

  696ca779a928 ("KVM: x86: fix #UD address of failed Hyper-V hypercalls")

from Linus' tree and commit:

  56b9ae78303a ("KVM: x86: hyperv: do rep check for each hypercall separately")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/kvm/hyperv.c
index 46ff64da44ca,14e0d0ae4e0a..000000000000
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@@ -1385,8 -1527,8 +1531,7 @@@ int kvm_hv_hypercall(struct kvm_vcpu *v
  		break;
  	}
  
- out:
 -	kvm_hv_hypercall_set_result(vcpu, ret);
 -	return 1;
 +	return kvm_hv_hypercall_complete(vcpu, ret);
  }
  
  void kvm_hv_init_vm(struct kvm *kvm)