diff options
author | 2025-05-13 10:37:01 +0200 | |
---|---|---|
committer | 2025-05-13 10:37:01 +0200 | |
commit | 2fb8414e644b133a9c3250f408232af99da256a4 (patch) | |
tree | 62212fe1b6dec3949a47ac6d92f3070842ab9ae2 /scripts/gdb/linux/utils.py | |
parent | Merge branch 'x86/boot' into x86/core, to merge dependent commits (diff) | |
parent | tools/arch/x86: Move the <asm/amd-ibs.h> header to <asm/amd/ibs.h> (diff) | |
download | linux-rng-2fb8414e644b133a9c3250f408232af99da256a4.tar.xz linux-rng-2fb8414e644b133a9c3250f408232af99da256a4.zip |
Merge branch 'x86/cpu' into x86/core, to resolve conflicts
Conflicts:
arch/x86/kernel/cpu/bugs.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/gdb/linux/utils.py')
0 files changed, 0 insertions, 0 deletions