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

[Stephen Rothwell]

Hi all,

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

  arch/x86/kvm/cpuid.c

between commit:

  16a7fe3728a8 ("KVM/VMX: Allow exposing EDECCSSA user leaf function to KVM guest")

from the tip tree and commit:

  047c72299061 ("KVM: x86: Update KVM-only leaf handling to allow for 100% KVM-only leafs")

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/cpuid.c
index c92c49a0b35b,723502181a3a..000000000000
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@@ -664,8 -675,8 +675,8 @@@ void kvm_set_cpu_caps(void
  		F(XSAVEOPT) | F(XSAVEC) | F(XGETBV1) | F(XSAVES) | f_xfd
  	);
  
- 	kvm_cpu_cap_init_scattered(CPUID_12_EAX,
+ 	kvm_cpu_cap_init_kvm_defined(CPUID_12_EAX,
 -		SF(SGX1) | SF(SGX2)
 +		SF(SGX1) | SF(SGX2) | SF(SGX_EDECCSSA)
  	);
  
  	kvm_cpu_cap_mask(CPUID_8000_0001_ECX,

Attachment: pgpoeZyAFknTo.pgp
Description: OpenPGP digital signature