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
Date: Wed, 7 Feb 2024 15:35:01 +1100 [thread overview]
Message-ID: <20240207153501.2c575b60@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1656 bytes --]
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;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-02-07 4:35 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-07 4:35 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-05-27 14:22 linux-next: manual merge of the kvm-x86 tree with the tip tree Mark Brown
2026-05-18 16:10 Mark Brown
2026-03-04 12:21 Mark Brown
2026-03-04 23:10 ` Sean Christopherson
2026-03-05 19:24 ` Nathan Chancellor
2026-03-06 13:24 ` Mark Brown
2026-03-06 22:48 ` Nathan Chancellor
2025-11-25 4:59 Stephen Rothwell
2025-11-25 7:09 ` Borislav Petkov
2025-12-04 5:10 ` Stephen Rothwell
2025-11-20 4:52 Stephen Rothwell
2025-11-20 4:46 Stephen Rothwell
2025-10-20 0:07 Stephen Rothwell
2025-09-22 9:50 Mark Brown
2025-09-22 11:27 ` Aithal, Srikanth
2025-09-22 11:40 ` Mark Brown
2025-09-22 13:23 ` Mark Brown
2025-09-22 14:04 ` Sean Christopherson
2025-09-30 18:13 ` Paolo Bonzini
2025-09-19 13:50 Mark Brown
2025-01-06 4:05 Stephen Rothwell
2025-01-09 19:18 ` Sean Christopherson
2025-01-23 3:25 ` Stephen Rothwell
2023-01-19 23:54 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240207153501.2c575b60@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ashish.kalra@amd$(echo .)com \
--cc=bp@alien8$(echo .)de \
--cc=brijesh.singh@amd$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=jarkko@profian$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=michael.roth@amd$(echo .)com \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=seanjc@google$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
--cc=thomas.lendacky@amd$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox