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

[Stephen Rothwell]

Hi all,

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

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

between commit:

  29b0075ed61c ("KVM: selftests: Fix __GUEST_ASSERT() format warnings in ARM's arch timer test")

from the kvm-arm tree and commit:

  5448d9282af5 ("KVM: selftests: Fix spelling mistake "trigged" -> "triggered"")

from the kvm-riscv 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/aarch64/arch_timer.c
index 93100b3f1312,16ac74d07d68..000000000000
--- a/tools/testing/selftests/kvm/aarch64/arch_timer.c
+++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c
@@@ -135,8 -135,8 +135,8 @@@ static void guest_run_stage(struct test
  
  		irq_iter = READ_ONCE(shared_data->nr_iter);
  		__GUEST_ASSERT(config_iter + 1 == irq_iter,
 -				"config_iter + 1 = 0x%lx, irq_iter = 0x%lx.\n"
 +				"config_iter + 1 = 0x%x, irq_iter = 0x%x.\n"
- 				"  Guest timer interrupt was not trigged within the specified\n"
+ 				"  Guest timer interrupt was not triggered within the specified\n"
  				"  interval, try to increase the error margin by [-e] option.\n",
  				config_iter + 1, irq_iter);
  	}

Attachment: pgpEk5LB_cCYu.pgp
Description: OpenPGP digital signature