Received-SPF: pass (google.com: domain of linux-kernel+bounces-94946-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Thu, 7 Mar 2024 14:59:46 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Sean Christopherson <seanjc@google.com>, Anup Patel
 <anup@brainfault.org>
Cc: Haibo Xu <haibo1.xu@intel.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Peter Gonda <pgonda@google.com>
Subject: linux-next: manual merge of the kvm-x86 tree with the kvm-riscv
 tree
Message-ID: <20240307145946.7e014225@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/cT/yWs_83ci0fs0UAHyzWOS";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/cT/yWs_83ci0fs0UAHyzWOS
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  tools/testing/selftests/kvm/include/kvm_util_base.h

between commit:

  1e979288c9b5 ("KVM: riscv: selftests: Add guest helper to get vcpu id")

from the kvm-riscv tree and commit:

  be1bd4c5394f ("KVM: selftests: Allow tagging protected memory in guest pa=
ge tables")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc tools/testing/selftests/kvm/include/kvm_util_base.h
index 39c2499df341,194963e05341..000000000000
--- a/tools/testing/selftests/kvm/include/kvm_util_base.h
+++ b/tools/testing/selftests/kvm/include/kvm_util_base.h
@@@ -1081,6 -1128,6 +1128,8 @@@ void kvm_selftest_arch_init(void)
 =20
  void kvm_arch_vm_post_create(struct kvm_vm *vm);
 =20
 +uint32_t guest_get_vcpuid(void);
 +
+ bool vm_is_gpa_protected(struct kvm_vm *vm, vm_paddr_t paddr);
+=20
  #endif /* SELFTEST_KVM_UTIL_BASE_H */

--Sig_/cT/yWs_83ci0fs0UAHyzWOS
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXpO7IACgkQAVBC80lX
0GyG9Qf8DDP1fXzfBSzdkDdU4qEEiccdmqmezJaI8DGdGvOd0lWf4c7jIbksOkhz
FQus6ycG/LnM+t8lK5dtMiWvdobwoy0JtYKvOjchozKrPMtGmHxIq0amuqIaIfc1
eV20RrvdmVylHdQcEe0vLCUcGcUWsaSViuKzXK8LHXN+lqPlx4/b5IdW4BcXw917
7ccMxIhvOGmBWktCT6m9zFZIMv9WC6WOmrgoNVtqiHdc6cEnlcGiCKFRwVDBT677
Ez1Inmsexe60dQNvr51A4yZcUwHoLCtOp1k9hQpgcDSe4lvBLiw0CM0lc765TJjH
SP1LUGwGt62e6CKlzPxhGcHilAwQmQ==
=Hulk
-----END PGP SIGNATURE-----

--Sig_/cT/yWs_83ci0fs0UAHyzWOS--