diff options
| author | Ingo Molnar <[email protected]> | 2025-05-13 08:42:06 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2025-05-13 08:42:06 +0000 |
| commit | 1f82e8e1ca18aa0b020538a3f227f5d56382638e (patch) | |
| tree | 48234576b88abf45381ae3afdd9df9d9a641e6aa /mm/execmem.c | |
| parent | Merge branch 'x86/mm' into x86/core, to resolve conflicts (diff) | |
| parent | accel/habanalabs: Don't build the driver on UML (diff) | |
| download | kernel-1f82e8e1ca18aa0b020538a3f227f5d56382638e.tar.gz kernel-1f82e8e1ca18aa0b020538a3f227f5d56382638e.zip | |
Merge branch 'x86/msr' into x86/core, to resolve conflicts
Conflicts:
arch/x86/boot/startup/sme.c
arch/x86/coco/sev/core.c
arch/x86/kernel/fpu/core.c
arch/x86/kernel/fpu/xstate.c
Semantic conflict:
arch/x86/include/asm/sev-internal.h
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'mm/execmem.c')
0 files changed, 0 insertions, 0 deletions