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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 14 May 2018 15:36:10 +1000

Hi Shuah,

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

  tools/testing/selftests/kvm/vmx_tsc_adjust_test.c

between commit:

  bcb2b94ae010 ("KVM: selftests: exit with 0 status code when tests cannot be run")

from the kvm-fixes tree and commit:

  13911360966d ("selftests: kvm: return Kselftest Skip code for skipped tests")

from the kselftest 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 tools/testing/selftests/kvm/vmx_tsc_adjust_test.c
index aaa633263b2c,62fb73699eb6..000000000000
--- a/tools/testing/selftests/kvm/vmx_tsc_adjust_test.c
+++ b/tools/testing/selftests/kvm/vmx_tsc_adjust_test.c
@@@ -189,8 -191,8 +191,8 @@@ int main(int argc, char *argv[]
  	struct kvm_cpuid_entry2 *entry = kvm_get_supported_cpuid_entry(1);
  
  	if (!(entry->ecx & CPUID_VMX)) {
 -		printf("nested VMX not enabled, skipping test");
 +		fprintf(stderr, "nested VMX not enabled, skipping test\n");
- 		exit(KSFT_SKIP);
+ 		return KSFT_SKIP;
  	}
  
  	vm = vm_create_default_vmx(VCPU_ID, (void *) l1_guest_code);