diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-13 11:42:06 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-13 11:42:06 +0300 |
| commit | 1f82e8e1ca18aa0b020538a3f227f5d56382638e (patch) | |
| tree | 48234576b88abf45381ae3afdd9df9d9a641e6aa /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | 34be751998c1407a460efe3a20f9c4ddb8c82b9f (diff) | |
| parent | 9cf78722003178b09c409df9aafe9d79e5b9a74e (diff) | |
| download | linux-1f82e8e1ca18aa0b020538a3f227f5d56382638e.tar.xz | |
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 <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions