diff options
author | 2024-02-27 10:09:49 +0100 | |
---|---|---|
committer | 2024-02-27 10:09:49 +0100 | |
commit | 9b9c280b9af2aa851d83e7d0b79f36a3d869d745 (patch) | |
tree | b61cf8566669d9615234e87696a833ee487e2655 /arch/arm64/include/asm/kasan.h | |
parent | x86/apic: Build the x86 topology enumeration functions on UP APIC builds too (diff) | |
parent | x86/bugs: Use fixed addressing for VERW operand (diff) | |
download | linux-9b9c280b9af2aa851d83e7d0b79f36a3d869d745.tar.gz linux-9b9c280b9af2aa851d83e7d0b79f36a3d869d745.tar.bz2 linux-9b9c280b9af2aa851d83e7d0b79f36a3d869d745.zip |
Merge branch 'x86/urgent' into x86/apic, to resolve conflicts
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/intel.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/kasan.h')
0 files changed, 0 insertions, 0 deletions