From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@kernel•org>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: "Borislav Petkov (AMD)" <bp@alien8•de>,
"Chang S. Bae" <chang.seok.bae@intel•com>,
Dave Hansen <dave.hansen@linux•intel.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Pawan Gupta <pawan.kumar.gupta@linux•intel.com>,
"Xin Li (Intel)" <xin@zytor•com>
Subject: linux-next: manual merge of the tip tree with Linus' tree
Date: Tue, 13 May 2025 16:00:59 +1000 [thread overview]
Message-ID: <20250513160059.49ead604@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 5128 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/include/asm/cpufeatures.h
between commits:
159013a7ca18 ("x86/its: Enumerate Indirect Target Selection (ITS) bug")
8754e67ad4ac ("x86/its: Add support for ITS-safe indirect thunk")
2665281a07e1 ("x86/its: Add "vmexit" option to skip mitigation on some CPUs")
from Linus' tree and commits:
282cc5b67623 ("x86/cpufeatures: Clean up formatting")
13327fada7ff ("x86/cpufeatures: Shorten X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT")
3aba0b40cacd ("x86/cpufeatures: Shorten X86_FEATURE_AMD_HETEROGENEOUS_CORES")
b02dc185ee86 ("x86/cpufeatures: Add X86_FEATURE_APX")
4e2c719782a8 ("x86/cpu: Help users notice when running old Intel microcode")
from the tip 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 39e61212ac9a,7642310276a8..000000000000
--- a/arch/x86/include/asm/cpufeatures.h
+++ b/arch/x86/include/asm/cpufeatures.h
@@@ -476,12 -476,12 +476,13 @@@
#define X86_FEATURE_CLEAR_BHB_LOOP (21*32+ 1) /* Clear branch history at syscall entry using SW loop */
#define X86_FEATURE_BHI_CTRL (21*32+ 2) /* BHI_DIS_S HW control available */
#define X86_FEATURE_CLEAR_BHB_HW (21*32+ 3) /* BHI_DIS_S HW control enabled */
- #define X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT (21*32+ 4) /* Clear branch history at vmexit using SW loop */
- #define X86_FEATURE_AMD_FAST_CPPC (21*32 + 5) /* Fast CPPC */
- #define X86_FEATURE_AMD_HETEROGENEOUS_CORES (21*32 + 6) /* Heterogeneous Core Topology */
- #define X86_FEATURE_AMD_WORKLOAD_CLASS (21*32 + 7) /* Workload Classification */
- #define X86_FEATURE_PREFER_YMM (21*32 + 8) /* Avoid ZMM registers due to downclocking */
- #define X86_FEATURE_INDIRECT_THUNK_ITS (21*32 + 9) /* Use thunk for indirect branches in lower half of cacheline */
+ #define X86_FEATURE_CLEAR_BHB_VMEXIT (21*32+ 4) /* Clear branch history at vmexit using SW loop */
+ #define X86_FEATURE_AMD_FAST_CPPC (21*32+ 5) /* Fast CPPC */
+ #define X86_FEATURE_AMD_HTR_CORES (21*32+ 6) /* Heterogeneous Core Topology */
+ #define X86_FEATURE_AMD_WORKLOAD_CLASS (21*32+ 7) /* Workload Classification */
+ #define X86_FEATURE_PREFER_YMM (21*32+ 8) /* Avoid ZMM registers due to downclocking */
-#define X86_FEATURE_APX (21*32+ 9) /* Advanced Performance Extensions */
++#define X86_FEATURE_INDIRECT_THUNK_ITS (21*32+ 9) /* Use thunk for indirect branches in lower half of cacheline */
++#define X86_FEATURE_APX (21*32+10) /* Advanced Performance Extensions */
/*
* BUG word(s)
@@@ -528,12 -528,12 +529,14 @@@
#define X86_BUG_TDX_PW_MCE X86_BUG(31) /* "tdx_pw_mce" CPU may incur #MC if non-TD software does partial write to TDX private memory */
/* BUG word 2 */
- #define X86_BUG_SRSO X86_BUG(1*32 + 0) /* "srso" AMD SRSO bug */
- #define X86_BUG_DIV0 X86_BUG(1*32 + 1) /* "div0" AMD DIV0 speculation bug */
- #define X86_BUG_RFDS X86_BUG(1*32 + 2) /* "rfds" CPU is vulnerable to Register File Data Sampling */
- #define X86_BUG_BHI X86_BUG(1*32 + 3) /* "bhi" CPU is affected by Branch History Injection */
- #define X86_BUG_IBPB_NO_RET X86_BUG(1*32 + 4) /* "ibpb_no_ret" IBPB omits return target predictions */
- #define X86_BUG_SPECTRE_V2_USER X86_BUG(1*32 + 5) /* "spectre_v2_user" CPU is affected by Spectre variant 2 attack between user processes */
- #define X86_BUG_ITS X86_BUG(1*32 + 6) /* "its" CPU is affected by Indirect Target Selection */
- #define X86_BUG_ITS_NATIVE_ONLY X86_BUG(1*32 + 7) /* "its_native_only" CPU is affected by ITS, VMX is not affected */
+ #define X86_BUG_SRSO X86_BUG( 1*32+ 0) /* "srso" AMD SRSO bug */
+ #define X86_BUG_DIV0 X86_BUG( 1*32+ 1) /* "div0" AMD DIV0 speculation bug */
+ #define X86_BUG_RFDS X86_BUG( 1*32+ 2) /* "rfds" CPU is vulnerable to Register File Data Sampling */
+ #define X86_BUG_BHI X86_BUG( 1*32+ 3) /* "bhi" CPU is affected by Branch History Injection */
+ #define X86_BUG_IBPB_NO_RET X86_BUG( 1*32+ 4) /* "ibpb_no_ret" IBPB omits return target predictions */
+ #define X86_BUG_SPECTRE_V2_USER X86_BUG( 1*32+ 5) /* "spectre_v2_user" CPU is affected by Spectre variant 2 attack between user processes */
-#define X86_BUG_OLD_MICROCODE X86_BUG( 1*32+ 6) /* "old_microcode" CPU has old microcode, it is surely vulnerable to something */
++#define X86_BUG_ITS X86_BUG( 1*32+ 6) /* "its" CPU is affected by Indirect Target Selection */
++#define X86_BUG_ITS_NATIVE_ONLY X86_BUG( 1*32+ 7) /* "its_native_only" CPU is affected by ITS, VMX is not affected */
++#define X86_BUG_OLD_MICROCODE X86_BUG( 1*32+ 8) /* "old_microcode" CPU has old microcode, it is surely vulnerable to something */
+
#endif /* _ASM_X86_CPUFEATURES_H */
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-05-13 6:01 UTC|newest]
Thread overview: 135+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-13 6:00 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-28 0:22 linux-next: manual merge of the tip tree with Linus' tree Stephen Rothwell
2025-10-28 1:10 ` Tejun Heo
2025-10-28 14:08 ` Peter Zijlstra
2025-05-13 6:54 Stephen Rothwell
2025-05-13 9:13 ` Ingo Molnar
2025-05-13 10:35 ` Stephen Rothwell
2025-05-13 6:52 Stephen Rothwell
2025-05-13 6:49 Stephen Rothwell
2025-05-13 6:45 Stephen Rothwell
2025-05-13 6:10 Stephen Rothwell
2025-05-13 5:48 Stephen Rothwell
2025-05-13 23:09 ` Bagas Sanjaya
2024-02-08 1:30 Stephen Rothwell
2023-10-16 1:38 Stephen Rothwell
2023-08-09 2:15 Stephen Rothwell
2023-02-15 1:08 Stephen Rothwell
2023-02-15 11:15 ` Ingo Molnar
2022-07-13 5:08 Stephen Rothwell
2022-05-09 3:59 Stephen Rothwell
2022-01-04 2:45 Stephen Rothwell
2021-10-11 2:21 Stephen Rothwell
2021-10-11 20:48 ` Borislav Petkov
2020-11-06 2:39 Stephen Rothwell
2020-11-06 2:46 ` Steven Rostedt
2020-08-12 1:21 Stephen Rothwell
2020-06-11 1:00 Stephen Rothwell
2020-06-11 0:52 Stephen Rothwell
2020-06-11 10:43 ` Thomas Gleixner
2020-06-11 11:03 ` Stephen Rothwell
2020-06-10 1:49 Stephen Rothwell
2020-06-10 1:42 Stephen Rothwell
2020-05-18 5:10 Stephen Rothwell
2020-05-18 7:12 ` Borislav Petkov
2020-01-06 2:17 Stephen Rothwell
2020-01-06 6:53 ` Ingo Molnar
2019-12-20 1:53 Stephen Rothwell
2019-12-16 2:43 Stephen Rothwell
2019-12-03 2:10 Stephen Rothwell
2019-12-03 6:57 ` Ingo Molnar
2019-12-03 8:56 ` Stephen Rothwell
2019-09-02 7:31 Stephen Rothwell
2019-09-02 18:07 ` Ingo Molnar
2019-07-29 2:00 Stephen Rothwell
2019-03-06 5:53 Stephen Rothwell
2018-10-12 2:14 Stephen Rothwell
2018-10-12 2:18 ` Kees Cook
2018-10-12 10:47 ` Ingo Molnar
2018-10-12 18:56 ` Kees Cook
2018-06-07 1:53 Stephen Rothwell
2018-02-12 1:27 Stephen Rothwell
2018-02-12 7:19 ` Ingo Molnar
2018-02-06 0:54 Stephen Rothwell
2018-02-06 9:14 ` Peter Zijlstra
2018-02-06 0:44 Stephen Rothwell
2018-02-06 0:40 Stephen Rothwell
2018-02-06 12:52 ` Mathieu Desnoyers
2018-02-06 13:55 ` Will Deacon
2018-02-06 14:06 ` Mathieu Desnoyers
2018-02-06 14:11 ` Will Deacon
2018-02-06 17:05 ` Mathieu Desnoyers
2018-02-06 17:21 ` Will Deacon
2018-02-08 7:03 ` Ingo Molnar
2018-02-08 18:56 ` Will Deacon
2018-02-08 19:04 ` Mathieu Desnoyers
2018-02-09 18:25 ` Will Deacon
2018-02-09 20:35 ` Mathieu Desnoyers
2017-11-10 1:27 Stephen Rothwell
2017-05-22 3:27 Stephen Rothwell
2017-05-22 8:32 ` Mark Rutland
2017-05-22 21:44 ` Stephen Rothwell
2017-05-23 8:37 ` Mark Rutland
2016-02-03 0:09 Stephen Rothwell
2016-02-03 0:32 ` Toshi Kani
2015-09-18 1:12 Stephen Rothwell
2015-08-17 5:57 Stephen Rothwell
2015-07-06 0:08 Stephen Rothwell
2015-07-06 7:49 ` Paolo Bonzini
2015-07-06 21:34 ` Stephen Rothwell
2014-05-21 4:12 Stephen Rothwell
2014-05-21 4:24 ` H. Peter Anvin
2014-05-21 6:01 ` Ingo Molnar
2014-05-21 6:02 ` H. Peter Anvin
2014-05-21 6:05 ` Ingo Molnar
2014-05-21 6:10 ` Ingo Molnar
2014-05-21 4:12 Stephen Rothwell
2014-03-21 4:23 Stephen Rothwell
2014-03-21 8:47 ` Srivatsa S. Bhat
2014-02-18 3:09 Stephen Rothwell
2014-02-18 8:06 ` Hans-Christian Egtvedt
2014-02-18 14:15 ` Chen Gang
2014-01-30 1:42 Stephen Rothwell
2014-01-30 1:49 ` Andi Kleen
2014-01-30 1:58 ` Stephen Rothwell
2014-01-30 2:05 ` Andi Kleen
2014-01-28 0:43 Stephen Rothwell
2014-01-17 3:30 Stephen Rothwell
2014-01-17 17:27 ` Sören Brinkmann
2013-12-16 3:18 Stephen Rothwell
2013-09-04 4:24 Stephen Rothwell
2013-07-09 4:36 Stephen Rothwell
2012-12-03 4:19 Stephen Rothwell
2012-10-16 1:00 Stephen Rothwell
2012-10-21 16:29 ` Ingo Molnar
2012-10-15 0:32 Stephen Rothwell
2012-10-10 2:51 Stephen Rothwell
2012-10-10 2:45 Stephen Rothwell
2012-06-26 4:36 Stephen Rothwell
2012-06-22 5:01 Stephen Rothwell
2012-06-04 3:52 Stephen Rothwell
2012-05-22 5:44 Stephen Rothwell
2012-01-03 5:16 Stephen Rothwell
2012-01-03 5:08 Stephen Rothwell
2012-01-03 8:06 ` Ingo Molnar
2012-01-03 8:36 ` Stephen Rothwell
2011-04-14 3:14 Stephen Rothwell
2011-04-14 9:02 ` Peter Zijlstra
2011-04-14 9:25 ` Ingo Molnar
2011-04-08 5:02 Stephen Rothwell
2011-03-16 5:08 Stephen Rothwell
2011-03-16 8:50 ` Sebastian Andrzej Siewior
2011-03-16 11:02 ` Stephen Rothwell
2010-10-22 2:08 Stephen Rothwell
2010-10-06 2:47 Stephen Rothwell
2010-09-23 3:32 Stephen Rothwell
2010-07-26 3:39 Stephen Rothwell
2010-01-18 7:08 Stephen Rothwell
2010-01-18 7:50 ` Ingo Molnar
2010-01-18 8:59 ` Stephen Rothwell
2009-12-09 4:06 Stephen Rothwell
2009-09-24 4:07 Stephen Rothwell
2009-09-24 8:33 ` Ingo Molnar
2009-09-24 9:23 ` Stephen Rothwell
2009-08-19 6:07 Stephen Rothwell
2009-08-19 10:37 ` Ingo Molnar
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=20250513160059.49ead604@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bp@alien8$(echo .)de \
--cc=chang.seok.bae@intel$(echo .)com \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=pawan.kumar.gupta@linux$(echo .)intel.com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=xin@zytor$(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