diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-09-05 09:01:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-09-05 09:01:42 +0200 |
| commit | 0ca77f8d33e8136b8926775380506f78a8d04811 (patch) | |
| tree | bb6d77ca7b4a8250dd2f2becc214107737be7119 /drivers/cdx/controller/mcdi_functions.c | |
| parent | 9f8d92a1fbb5a08e17f9d405a1ab27be64096d8c (diff) | |
| parent | d4bc3b11c12b41fdb5650f5ad797de97f8dce869 (diff) | |
Merge branch 'x86/apic' into x86/sev, to resolve conflict
Conflicts:
arch/x86/include/asm/sev-internal.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/cdx/controller/mcdi_functions.c')
0 files changed, 0 insertions, 0 deletions