* [PATCH] x86/cpu: Drop spurious underscore from RAPTOR_LAKE #define
@ 2021-11-19 17:08 Tony Luck
2021-11-30 22:11 ` [tip: x86/urgent] " tip-bot2 for Tony Luck
0 siblings, 1 reply; 2+ messages in thread
From: Tony Luck @ 2021-11-19 17:08 UTC (permalink / raw)
To: Dave Hansen; +Cc: x86, linux-kernel, Tony Luck, Rui Zhang
Convention for all the other "lake" CPUs is all one word.
So s/RAPTOR_LAKE/RAPTORLAKE/
Reported-by: Rui Zhang <rui.zhang@intel.com>
Fixes: fbdb5e8f2926 ("x86/cpu: Add Raptor Lake to Intel family")
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
Dave Hansen had thanked me for sending a simple patch on his first full
day as x86 maintainer. I had foolishly said: "You can hand me a giant
brown paper bag if I broke the build with that patch." Well, I didn't
break the build. But the one-line change had an error in every line. My
usual collection of brown bags is at the office. So I'll have to make
a new one. Then explain to my family the tradition of brown paper bags.
Big thanks to Rui for catching this before I'd have the extra shame
of needing to backport to stable.
---
arch/x86/include/asm/intel-family.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
index 5a0bcf8b78d7..048b6d5aff50 100644
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -108,7 +108,7 @@
#define INTEL_FAM6_ALDERLAKE 0x97 /* Golden Cove / Gracemont */
#define INTEL_FAM6_ALDERLAKE_L 0x9A /* Golden Cove / Gracemont */
-#define INTEL_FAM6_RAPTOR_LAKE 0xB7
+#define INTEL_FAM6_RAPTORLAKE 0xB7
/* "Small Core" Processors (Atom) */
--
2.31.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: x86/urgent] x86/cpu: Drop spurious underscore from RAPTOR_LAKE #define
2021-11-19 17:08 [PATCH] x86/cpu: Drop spurious underscore from RAPTOR_LAKE #define Tony Luck
@ 2021-11-30 22:11 ` tip-bot2 for Tony Luck
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Tony Luck @ 2021-11-30 22:11 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Rui Zhang, Tony Luck, Dave Hansen, x86, linux-kernel
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 7d697f0d5737768fa1039b8953b67c08d8d406d1
Gitweb: https://git.kernel.org/tip/7d697f0d5737768fa1039b8953b67c08d8d406d1
Author: Tony Luck <tony.luck@intel.com>
AuthorDate: Fri, 19 Nov 2021 09:08:32 -08:00
Committer: Dave Hansen <dave.hansen@linux.intel.com>
CommitterDate: Tue, 30 Nov 2021 14:05:48 -08:00
x86/cpu: Drop spurious underscore from RAPTOR_LAKE #define
Convention for all the other "lake" CPUs is all one word.
So s/RAPTOR_LAKE/RAPTORLAKE/
Fixes: fbdb5e8f2926 ("x86/cpu: Add Raptor Lake to Intel family")
Reported-by: Rui Zhang <rui.zhang@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lkml.kernel.org/r/20211119170832.1034220-1-tony.luck@intel.com
---
arch/x86/include/asm/intel-family.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
index 5a0bcf8..048b6d5 100644
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -108,7 +108,7 @@
#define INTEL_FAM6_ALDERLAKE 0x97 /* Golden Cove / Gracemont */
#define INTEL_FAM6_ALDERLAKE_L 0x9A /* Golden Cove / Gracemont */
-#define INTEL_FAM6_RAPTOR_LAKE 0xB7
+#define INTEL_FAM6_RAPTORLAKE 0xB7
/* "Small Core" Processors (Atom) */
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-30 22:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-19 17:08 [PATCH] x86/cpu: Drop spurious underscore from RAPTOR_LAKE #define Tony Luck
2021-11-30 22:11 ` [tip: x86/urgent] " tip-bot2 for Tony Luck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).