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

[Mark Brown]

Hi all,

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

  tools/testing/selftests/kvm/x86/nested_x2apic_test.c

between commit:

  994489f04ebbb ("Merge tag 'kvm-x86-selftests-7.4' of https://github.com/kvm-x86/linux into HEAD")

from the kvm tree and commit:

  8b0aa41839602 ("Merge branch 'selftests'")

from the kvm-x86 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 --combined tools/testing/selftests/kvm/x86/nested_x2apic_test.c
index bba301cfc0b5a,2ae698c9aa1ce..0000000000000
--- a/tools/testing/selftests/kvm/x86/nested_x2apic_test.c
+++ b/tools/testing/selftests/kvm/x86/nested_x2apic_test.c
@@@ -86,7 -86,7 +86,7 @@@ static void l1_vmx_code(struct vmx_page
  		   SECONDARY_EXEC_APIC_REGISTER_VIRT |
  		   SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY;
  	control &= (rdmsr(MSR_IA32_VMX_PROCBASED_CTLS2) >> 32);
- 	vmwrite(SECONDARY_VM_EXEC_CONTROL, control), 0;
+ 	vmwrite(SECONDARY_VM_EXEC_CONTROL, control);
  
  	vmlaunch();
  	GUEST_ASSERT_EQ(vmread(VM_EXIT_REASON), EXIT_REASON_CPUID);

Attachment: signature.asc
Description: PGP signature