2024-05-13 06:55:29

by Ingo Molnar

Subject: [GIT PULL] x86/bugs change for v6.10

Linus,

Please pull the latest x86/bugs Git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-bugs-2024-05-13

# HEAD: f9f62a877da1e6f6e9d58bd779c1c77052eb04ab x86/dumpstack: Use uniform "Oops: " prefix for die() messages

Use uniform "Oops: " prefix for die() messages.

Thanks,

Ingo

------------------>
Alex Shi (1):
x86/dumpstack: Use uniform "Oops: " prefix for die() messages


arch/x86/kernel/dumpstack.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index 44a91ef5a23b..a7d562697e50 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -405,8 +405,8 @@ static void __die_header(const char *str, struct pt_regs *regs, long err)
pr = IS_ENABLED(CONFIG_PREEMPT_RT) ? " PREEMPT_RT" : " PREEMPT";

printk(KERN_DEFAULT
- "%s: %04lx [#%d]%s%s%s%s%s\n", str, err & 0xffff, ++die_counter,
- pr,
+ "Oops: %s: %04lx [#%d]%s%s%s%s%s\n", str, err & 0xffff,
+ ++die_counter, pr,
IS_ENABLED(CONFIG_SMP) ? " SMP" : "",
debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "",
IS_ENABLED(CONFIG_KASAN) ? " KASAN" : "",

2024-05-14 02:53:11

by pr-tracker-bot

Subject: Re: [GIT PULL] x86/bugs change for v6.10

The pull request you sent on Mon, 13 May 2024 08:54:58 +0200:

> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-bugs-2024-05-13

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7e3591453de3ce12e0d6d6d4e80ff3bb659e4d70

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html