From: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Sean Christopherson <seanjc@google•com>,
Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@kernel•org>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Babu Moger <babu.moger@amd•com>,
"Borislav Petkov (AMD)" <bp@alien8•de>,
Dave Hansen <dave.hansen@linux•intel.com>,
Elena Reshetova <elena.reshetova@intel•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Naveen N Rao (AMD)" <naveen@kernel•org>,
Borislav Petkov <bp@alien8•de>,
Paolo Bonzini <pbonzini@redhat•com>, KVM <kvm@vger•kernel.org>
Subject: Re: linux-next: manual merge of the kvm-x86 tree with the tip tree
Date: Thu, 4 Dec 2025 16:10:58 +1100 [thread overview]
Message-ID: <20251204161058.137028db@canb.auug.org.au> (raw)
In-Reply-To: <20251125155953.01b486f2@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2444 bytes --]
Hi all,
On Tue, 25 Nov 2025 15:59:53 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the kvm-x86 tree got a conflict in:
>
> arch/x86/include/asm/cpufeatures.h
>
> between commits:
>
> 6ffdb49101f0 ("x86/cpufeatures: Add X86_FEATURE_SGX_EUPDATESVN feature flag")
> 3767def18f4c ("x86/cpufeatures: Add support for L3 Smart Data Cache Injection Allocation Enforcement")
>
> from the tip tree and commits:
>
> 5d0316e25def ("x86/cpufeatures: Add X86_FEATURE_X2AVIC_EXT")
> f6106d41ec84 ("x86/bugs: Use an x86 feature to track the MMIO Stale Data mitigation")
>
> 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/include/asm/cpufeatures.h
> index d90ce601917c,646d2a77a2e2..000000000000
> --- a/arch/x86/include/asm/cpufeatures.h
> +++ b/arch/x86/include/asm/cpufeatures.h
> @@@ -503,9 -500,12 +504,15 @@@
> #define X86_FEATURE_IBPB_EXIT_TO_USER (21*32+14) /* Use IBPB on exit-to-userspace, see VMSCAPE bug */
> #define X86_FEATURE_ABMC (21*32+15) /* Assignable Bandwidth Monitoring Counters */
> #define X86_FEATURE_MSR_IMM (21*32+16) /* MSR immediate form instructions */
> -#define X86_FEATURE_X2AVIC_EXT (21*32+17) /* AMD SVM x2AVIC support for 4k vCPUs */
> -#define X86_FEATURE_CLEAR_CPU_BUF_VM_MMIO (21*32+18) /*
> +#define X86_FEATURE_SGX_EUPDATESVN (21*32+17) /* Support for ENCLS[EUPDATESVN] instruction */
> +
> +#define X86_FEATURE_SDCIAE (21*32+18) /* L3 Smart Data Cache Injection Allocation Enforcement */
> ++#define X86_FEATURE_X2AVIC_EXT (21*32+19) /* AMD SVM x2AVIC support for 4k vCPUs */
> ++#define X86_FEATURE_CLEAR_CPU_BUF_VM_MMIO (21*32+20) /*
> + * Clear CPU buffers before VM-Enter if the vCPU
> + * can access host MMIO (ignored for all intents
> + * and purposes if CLEAR_CPU_BUF_VM is set).
> + */
>
> /*
> * BUG word(s)
This is now a conflict between the kvm tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-12-04 5:11 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-25 4:59 linux-next: manual merge of the kvm-x86 tree with the tip tree Stephen Rothwell
2025-11-25 7:09 ` Borislav Petkov
2025-12-04 5:10 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-05-27 14:22 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-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
2024-02-07 4:35 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=20251204161058.137028db@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=babu.moger@amd$(echo .)com \
--cc=bp@alien8$(echo .)de \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=elena.reshetova@intel$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=naveen@kernel$(echo .)org \
--cc=pbonzini@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=seanjc@google$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
/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