Received-SPF: pass (google.com: domain of linux-kernel+bounces-120157-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Wed, 27 Mar 2024 11:29:07 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Anup Patel <anup@brainfault.org>, Christoffer Dall
 <cdall@cs.columbia.edu>, Marc Zyngier <maz@kernel.org>
Cc: Colin Ian King <colin.i.king@gmail.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Oliver Upton <oliver.upton@linux.dev>, Sean
 Christopherson <seanjc@google.com>
Subject: linux-next: manual merge of the kvm-riscv tree with the kvm-arm
 tree
Message-ID: <20240327112907.33cd9bb1@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Vvn7PGP=2RjBf5VVyLbFnIw";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/Vvn7PGP=2RjBf5VVyLbFnIw
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 AR=
M's arch timer test")

from the kvm-arm tree and commit:

  5448d9282af5 ("KVM: selftests: Fix spelling mistake "trigged" -> "trigger=
ed"")

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.

--=20
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
 =20
  		irq_iter =3D READ_ONCE(shared_data->nr_iter);
  		__GUEST_ASSERT(config_iter + 1 =3D=3D irq_iter,
 -				"config_iter + 1 =3D 0x%lx, irq_iter =3D 0x%lx.\n"
 +				"config_iter + 1 =3D 0x%x, irq_iter =3D 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);
  	}

--Sig_/Vvn7PGP=2RjBf5VVyLbFnIw
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYDaFMACgkQAVBC80lX
0Gxw1ggAinEtAG0d9NNLM1EX3ixxsy+EO6hgm0TP2h3HjWF6zVl9+K8fBsRriMkd
SwPepJ9hjDLeL8AZD/l9nvpPh+uB9QzSz/JZdm7YST/bTDm5iSsoOvRvPexEUV9O
oEnDWKexEc78YMzZ+xpdJqBTZgZCFn8ajBI3czK2NA2fVAxL9DoZfLUGlHpwjLXx
kxECuQ7h8T1NxJ2M+ushNDV3OwOZ9/lMnuObhbPEX551BPfcGb8TWEcly1m+/CUm
XzVCs4Mfo1KmbH9h381R91lroJcMUi682VdP7z0Bm8w31L58NrJBoYvsMFDpnDQ6
PZxsbfm5D69Pk/Wk7QnTFmDWVG7FxA==
=uLHq
-----END PGP SIGNATURE-----

--Sig_/Vvn7PGP=2RjBf5VVyLbFnIw--