From: Mark Brown <broonie@kernel•org>
To: Paolo Bonzini <pbonzini@redhat•com>, KVM <kvm@vger•kernel.org>
Cc: Emily Ehlert <ehemily@amazon•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Sean Christopherson <seanjc@google•com>
Subject: linux-next: manual merge of the kvm tree with the origin tree
Date: Mon, 1 Jun 2026 17:59:35 +0100 [thread overview]
Message-ID: <ah26dyqFIP006NTt@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/x86/kvm/x86.c
between commit:
b60621c5121c9 ("KVM: x86: Fix ERAPS RAP clear on INVPCID single-context invalidation")
from the origin tree and commit:
e31de5791093d ("KVM: x86: Drop the "EX" part of "EXREG" to avoid collision with APX")
from the kvm 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.
diff --cc arch/x86/kvm/x86.c
index 0550359ed798f,48f259015ce44..0000000000000
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -14330,7 -14309,7 +14316,7 @@@ int kvm_handle_invpcid(struct kvm_vcpu
* the RAP (Return Address Predicator).
*/
if (guest_cpu_cap_has(vcpu, X86_FEATURE_ERAPS))
- kvm_register_mark_dirty(vcpu, VCPU_EXREG_ERAPS);
- kvm_register_is_dirty(vcpu, VCPU_REG_ERAPS);
++ kvm_register_mark_dirty(vcpu, VCPU_REG_ERAPS);
kvm_invalidate_pcid(vcpu, operand.pcid);
return kvm_skip_emulated_instruction(vcpu);
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-06-01 16:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-01 16:59 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-02 16:01 linux-next: manual merge of the kvm tree with the origin tree Mark Brown
2025-10-02 18:39 ` Sean Christopherson
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=ah26dyqFIP006NTt@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=ehemily@amazon$(echo .)de \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pbonzini@redhat$(echo .)com \
--cc=seanjc@google$(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