From: Paolo Bonzini <pbonzini@redhat•com>
To: Mark Brown <broonie@kernel•org>, Sean Christopherson <seanjc@google•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the kvm-x86 tree with the kvm tree
Date: Thu, 12 Feb 2026 15:14:47 +0100 [thread overview]
Message-ID: <d68022c2-0c62-4acd-b287-8a409daa2c89@redhat.com> (raw)
In-Reply-To: <aY3e0hIT1UDqLcvK@sirena.org.uk>
On 2/12/26 15:08, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-x86 tree got conflicts in:
>
> arch/x86/kvm/svm/svm.c
> arch/x86/kvm/vmx/vmx.c
>
> between commit:
>
> 9e03b7caf4e65 ("Merge tag 'kvm-x86-misc-6.20' of https://github.com/kvm-x86/linux into HEAD")
>
> from the kvm tree and commit:
>
> f8ade833b733a ("KVM: x86: Explicitly configure supported XSS from {svm,vmx}_set_cpu_caps()")
>
> 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.
Thanks, this is the tree that will go to Linus later today, so Sean will
simply have to reset his tree to Linus's as usual.
Paolo
> diff --combined arch/x86/kvm/svm/svm.c
> index 8f8bc863e2143,5f0136dbdde6b..0000000000000
> --- a/arch/x86/kvm/svm/svm.c
> +++ b/arch/x86/kvm/svm/svm.c
> @@@ -5389,6 -5389,7 +5389,6 @@@ static __init void svm_set_cpu_caps(voi
> kvm_cpu_cap_clear(X86_FEATURE_MSR_IMM);
>
> kvm_setup_xss_caps();
> -
> kvm_finalize_cpu_caps();
> }
>
> diff --combined arch/x86/kvm/vmx/vmx.c
> index 967b58a8ab9d0,11bb4b9332274..0000000000000
> --- a/arch/x86/kvm/vmx/vmx.c
> +++ b/arch/x86/kvm/vmx/vmx.c
> @@@ -8247,6 -8247,7 +8247,6 @@@ static __init void vmx_set_cpu_caps(voi
> }
>
> kvm_setup_xss_caps();
> -
> kvm_finalize_cpu_caps();
> }
>
next prev parent reply other threads:[~2026-02-12 14:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-12 14:08 linux-next: manual merge of the kvm-x86 tree with the kvm tree Mark Brown
2026-02-12 14:14 ` Paolo Bonzini [this message]
2026-02-12 15:21 ` Sean Christopherson
-- strict thread matches above, loose matches on Subject: below --
2024-07-17 3:58 Stephen Rothwell
2024-04-12 3:14 Stephen Rothwell
2024-02-20 2:48 Stephen Rothwell
2024-02-20 15:33 ` 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=d68022c2-0c62-4acd-b287-8a409daa2c89@redhat.com \
--to=pbonzini@redhat$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--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