diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:47:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:47:10 +0200 |
| commit | c4070e1996e05dd2eb5e08ee68d0d00553ae08f7 (patch) | |
| tree | 180e4a4bae29635fd54bf7e7ca29f5e15ff0b8fc /scripts/gdb/linux/utils.py | |
| parent | Merge branch 'x86/platform' into x86/core, to merge dependent commits (diff) | |
| parent | Merge tag 'its-for-linus-20250509' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| download | linux-rng-c4070e1996e05dd2eb5e08ee68d0d00553ae08f7.tar.xz linux-rng-c4070e1996e05dd2eb5e08ee68d0d00553ae08f7.zip | |
Merge commit 'its-for-linus-20250509-merge' into x86/core, to resolve conflicts
Conflicts:
Documentation/admin-guide/hw-vuln/index.rst
arch/x86/include/asm/cpufeatures.h
arch/x86/kernel/alternative.c
arch/x86/kernel/cpu/bugs.c
arch/x86/kernel/cpu/common.c
drivers/base/cpu.c
include/linux/cpu.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/gdb/linux/utils.py')
0 files changed, 0 insertions, 0 deletions