linux-next: manual merge of the kvms390 tree with the origin tree

[Mark Brown]

Hi all,

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

  tools/testing/selftests/kvm/Makefile.kvm

between commit:

  0c6294d98a6df ("KVM: s390: selftests: Add IRQ routing address offset tests")

from the origin tree and commit:

  857e92662c075 ("KVM: s390: selftests: enable some common memory-related tests")

from the kvms390 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.

I note that it's traditional to sort these lists to minimise
conflicts...

diff --cc tools/testing/selftests/kvm/Makefile.kvm
index 7c2713967c699,057f17d6b896d..0000000000000
--- a/tools/testing/selftests/kvm/Makefile.kvm
+++ b/tools/testing/selftests/kvm/Makefile.kvm
@@@ -207,7 -203,7 +205,8 @@@ TEST_GEN_PROGS_s390 += s390/ucontrol_te
  TEST_GEN_PROGS_s390 += s390/user_operexec
  TEST_GEN_PROGS_s390 += s390/keyop
  TEST_GEN_PROGS_s390 += rseq_test
 +TEST_GEN_PROGS_s390 += s390/irq_routing
+ TEST_GEN_PROGS_s390 += mmu_stress_test
  
  TEST_GEN_PROGS_riscv = $(TEST_GEN_PROGS_COMMON)
  TEST_GEN_PROGS_riscv += riscv/sbi_pmu_test