Received-SPF: pass (google.com: domain of linux-kernel+bounces-55935-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Wed, 7 Feb 2024 15:35:01 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Sean Christopherson <seanjc@google.com>, Thomas Gleixner
 <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin"
 <hpa@zytor.com>, Peter Zijlstra <peterz@infradead.org>
Cc: Ashish Kalra <ashish.kalra@amd.com>, "Borislav Petkov (AMD)"
 <bp@alien8.de>, Brijesh Singh <brijesh.singh@amd.com>, Jarkko Sakkinen
 <jarkko@profian.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Michael Roth <michael.roth@amd.com>, Tom
 Lendacky <thomas.lendacky@amd.com>
Subject: linux-next: manual merge of the kvm-x86 tree with the tip tree
Message-ID: <20240207153501.2c575b60@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/A_aqSM6/V3s=i1Z7iKqJY9o";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/A_aqSM6/V3s=i1Z7iKqJY9o
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:

  arch/x86/kvm/svm/sev.c

between commit:

  1ca5614b84ee ("crypto: ccp: Add support to initialize the AMD-SP for SEV-=
SNP")

from the tip tree and commit:

  cc4ce37bed85 ("KVM: SVM: Set sev->asid in sev_asid_new() instead of overl=
oading the return")

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 arch/x86/kvm/svm/sev.c
index f99435b6648f,f06f9e51ad9d..000000000000
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@@ -246,8 -254,7 +254,8 @@@ static void sev_unbind_asid(struct kvm=20
  static int sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp)
  {
  	struct kvm_sev_info *sev =3D &to_kvm_svm(kvm)->sev_info;
 +	struct sev_platform_init_args init_args =3D {0};
- 	int asid, ret;
+ 	int ret;
 =20
  	if (kvm->created_vcpus)
  		return -EINVAL;
@@@ -258,13 -264,11 +265,12 @@@
 =20
  	sev->active =3D true;
  	sev->es_active =3D argp->id =3D=3D KVM_SEV_ES_INIT;
- 	asid =3D sev_asid_new(sev);
- 	if (asid < 0)
+ 	ret =3D sev_asid_new(sev);
+ 	if (ret)
  		goto e_no_asid;
- 	sev->asid =3D asid;
 =20
 -	ret =3D sev_platform_init(&argp->error);
 +	init_args.probe =3D false;
 +	ret =3D sev_platform_init(&init_args);
  	if (ret)
  		goto e_free;
 =20

--Sig_/A_aqSM6/V3s=i1Z7iKqJY9o
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXDCHUACgkQAVBC80lX
0GwG0gf9ExbnjoE/XTjiMmZ7JfLwh+GLq11VlGyW51dsyURCw6jK1lt3ukR6O387
DolkQJeb5U52V7U+weeDkoCZhNGrXjovnTXB+0CKOXno7yunkaPk6/JTk44gWC/i
/NgoRwRAerOrhfa2ayi7bQqSqzBu2KZXgmWmcPcWonZ/N0gsNX4r3e1bUJrDDhgN
ka2avv+G491ypfp/iUtzJ7PwrqwAVMOnJ4+iDgKpgF80XMuvGKmcMPv6tZgvmeMm
DO5y2uneYY7PsqQ6GidOts2gcH6KDYyNU/YbD+xSznqx1AgcvMl9N9fPT8FZnjah
S9oxMhOg7sTX+nRJ4t1n6zuGuRKouA==
=cSPR
-----END PGP SIGNATURE-----

--Sig_/A_aqSM6/V3s=i1Z7iKqJY9o--