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

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

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

  tools/testing/selftests/kvm/aarch64/vgic_init.c

between commits:

  98f94ce42ac6 ("KVM: selftests: Move KVM_CREATE_DEVICE_TEST code to separate helper")
  7ed397d107d4 ("KVM: selftests: Add TEST_REQUIRE macros to reduce skipping copy+paste")

from the kvm tree and commit:

  6a4f7fcd7504 ("KVM: arm64: selftests: Add support for GICv2 on v3")

from the kvm-arm tree.

I fixed it up (I think, 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/aarch64/vgic_init.c
index e8cab9840aa3,21ba4002fc18..000000000000
--- a/tools/testing/selftests/kvm/aarch64/vgic_init.c
+++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c
@@@ -661,9 -668,9 +661,9 @@@ int test_kvm_device(uint32_t gic_dev_ty
  	other = VGIC_DEV_IS_V2(gic_dev_type) ? KVM_DEV_TYPE_ARM_VGIC_V3
  					     : KVM_DEV_TYPE_ARM_VGIC_V2;
  
 -	if (!_kvm_create_device(v.vm, other, true, &fd)) {
 -		ret = _kvm_create_device(v.vm, other, false, &fd);
 +	if (!__kvm_test_create_device(v.vm, other)) {
 +		ret = __kvm_test_create_device(v.vm, other);
- 		TEST_ASSERT(ret && errno == EINVAL,
+ 		TEST_ASSERT(ret && (errno == EINVAL || errno == EEXIST),
  				"create GIC device while other version exists");
  	}
  
@@@ -703,9 -711,15 +704,13 @@@ int main(int ac, char **av
  	}
  
  	ret = test_kvm_device(KVM_DEV_TYPE_ARM_VGIC_V2);
- 	__TEST_REQUIRE(!ret, "No GICv2 nor GICv3 support");
+ 	if (!ret) {
+ 		pr_info("Running GIC_v2 tests.\n");
+ 		run_tests(KVM_DEV_TYPE_ARM_VGIC_V2);
+ 		cnt_impl++;
+ 	}
+ 
 -	if (!cnt_impl) {
 -		print_skip("No GICv2 nor GICv3 support");
 -		exit(KSFT_SKIP);
 -	}
++	__TEST_REQUIRE(!cnt_impl, "No GICv2 nor GICv3 support");
 +
- 	pr_info("Running GIC_v2 tests.\n");
- 	run_tests(KVM_DEV_TYPE_ARM_VGIC_V2);
  	return 0;
  }

Attachment: pgpaXBfKFPOsA.pgp
Description: OpenPGP digital signature