Subject: linux-next: manual merge of the kvm-x86 tree with the tip tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 7 Feb 2024 15:35:01 +1100

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 overloading 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.

-- 
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 
  static int sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp)
  {
  	struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
 +	struct sev_platform_init_args init_args = {0};
- 	int asid, ret;
+ 	int ret;
  
  	if (kvm->created_vcpus)
  		return -EINVAL;
@@@ -258,13 -264,11 +265,12 @@@
  
  	sev->active = true;
  	sev->es_active = argp->id == KVM_SEV_ES_INIT;
- 	asid = sev_asid_new(sev);
- 	if (asid < 0)
+ 	ret = sev_asid_new(sev);
+ 	if (ret)
  		goto e_no_asid;
- 	sev->asid = asid;
  
 -	ret = sev_platform_init(&argp->error);
 +	init_args.probe = false;
 +	ret = sev_platform_init(&init_args);
  	if (ret)
  		goto e_free;