Received-SPF: pass (google.com: domain of linux-kernel+bounces-163322-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Tue, 30 Apr 2024 14:28:14 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Sean Christopherson <seanjc@google.com>, Christoffer Dall
 <cdall@cs.columbia.edu>, Marc Zyngier <maz@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>, Oliver Upton
 <oliver.upton@linux.dev>
Subject: linux-next: manual merge of the kvm-x86 tree with the kvm-arm tree
Message-ID: <20240430142814.183a8167@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/sHHn/d6V6_XHdWyEGUak66k";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/sHHn/d6V6_XHdWyEGUak66k
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/aarch64/psci_test.c

between commit:

  c3c369b508d9 ("KVM: selftests: Use MPIDR_HWID_BITMASK from cputype.h")

from the kvm-arm tree and commit:

  730cfa45b5f4 ("KVM: selftests: Define _GNU_SOURCE for all selftests code")

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/aarch64/psci_test.c
index 9fa3578d47d5,1c8c6f0c1ca3..000000000000
--- a/tools/testing/selftests/kvm/aarch64/psci_test.c
+++ b/tools/testing/selftests/kvm/aarch64/psci_test.c
@@@ -10,12 -10,7 +10,9 @@@
   *  - A test for KVM's handling of PSCI SYSTEM_SUSPEND and the associated
   *    KVM_SYSTEM_EVENT_SUSPEND UAPI.
   */
-=20
- #define _GNU_SOURCE
-=20
 +#include <linux/kernel.h>
  #include <linux/psci.h>
 +#include <asm/cputype.h>
 =20
  #include "kvm_util.h"
  #include "processor.h"

--Sig_/sHHn/d6V6_XHdWyEGUak66k
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYwc14ACgkQAVBC80lX
0Gww7Af/aEPqvkljoKd262ArRNpAi25R6NGo4qkrr6R2doTW+/zeePVBEsF1KlAq
du0jSpijF9aEvJAaXQERPTZR4cOiBYtCU0DtOEXtHIqKx4AnzkMhGG6fY+9/5giF
NAA/MhIx1SeaxA6gzsg73QVW4rnhSQGXplKkqbMIF6NZ83/9MmWp9AS8o2vB47Gp
EGcD/rpK1Ul6+kvwFNw9OC8QDprU43CPN/tfc3xs9aNFjb91adzjHLb2AbQkQTGh
OdBIbs7tqUYZkO5pWOPezhk35DLUshn7mHH9ItqhQKQ62GzFYYHCCZOWLzw9bk4b
jpohhFTDs9BO3YG6faBeK13DUYsasA==
=VYBC
-----END PGP SIGNATURE-----

--Sig_/sHHn/d6V6_XHdWyEGUak66k--