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

[Stephen Rothwell]

Hi all,

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

  tools/testing/selftests/kvm/Makefile

between commits:

  17da79e009c3 ("KVM: arm64: selftests: Split get-reg-list test code")
  477069398ed6 ("KVM: riscv: selftests: Add get-reg-list test")

from the kvm-riscv tree and commit:

  5d1d46f9d56f ("KVM: selftests: Add a selftest for guest prints and formatted asserts")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/testing/selftests/kvm/Makefile
index 8852c37fbc2d,77026907968f..000000000000
--- a/tools/testing/selftests/kvm/Makefile
+++ b/tools/testing/selftests/kvm/Makefile
@@@ -151,7 -154,7 +153,8 @@@ TEST_GEN_PROGS_aarch64 += access_tracki
  TEST_GEN_PROGS_aarch64 += demand_paging_test
  TEST_GEN_PROGS_aarch64 += dirty_log_test
  TEST_GEN_PROGS_aarch64 += dirty_log_perf_test
 +TEST_GEN_PROGS_aarch64 += get-reg-list
+ TEST_GEN_PROGS_aarch64 += guest_print_test
  TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus
  TEST_GEN_PROGS_aarch64 += kvm_page_table_test
  TEST_GEN_PROGS_aarch64 += memslot_modification_stress_test
@@@ -166,9 -169,9 +169,10 @@@ TEST_GEN_PROGS_s390x += s390x/reset
  TEST_GEN_PROGS_s390x += s390x/sync_regs_test
  TEST_GEN_PROGS_s390x += s390x/tprot
  TEST_GEN_PROGS_s390x += s390x/cmma_test
 +TEST_GEN_PROGS_s390x += s390x/debug_test
  TEST_GEN_PROGS_s390x += demand_paging_test
  TEST_GEN_PROGS_s390x += dirty_log_test
+ TEST_GEN_PROGS_s390x += guest_print_test
  TEST_GEN_PROGS_s390x += kvm_create_max_vcpus
  TEST_GEN_PROGS_s390x += kvm_page_table_test
  TEST_GEN_PROGS_s390x += rseq_test
@@@ -177,7 -180,7 +181,8 @@@ TEST_GEN_PROGS_s390x += kvm_binary_stat
  
  TEST_GEN_PROGS_riscv += demand_paging_test
  TEST_GEN_PROGS_riscv += dirty_log_test
 +TEST_GEN_PROGS_riscv += get-reg-list
+ TEST_GEN_PROGS_riscv += guest_print_test
  TEST_GEN_PROGS_riscv += kvm_create_max_vcpus
  TEST_GEN_PROGS_riscv += kvm_page_table_test
  TEST_GEN_PROGS_riscv += set_memory_region_test

Attachment: pgp6ZeD5a5myj.pgp
Description: OpenPGP digital signature