diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-02-26 13:06:48 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-02-26 13:10:35 +0300 |
| commit | 2e5fc4786b7ad311393a70894c773aa106c6dbb3 (patch) | |
| tree | 5eb9d382795a6739f1c556eaf69fdcfa6b265b7e /tools/perf/scripts/python/exported-sql-viewer.py | |
| parent | 29cd85557d8b8b3d068b5c29fdd9a0fa9ca7ef7a (diff) | |
| parent | ee8ff8768735edc3e013837c4416f819543ddc17 (diff) | |
| download | linux-2e5fc4786b7ad311393a70894c773aa106c6dbb3.tar.xz | |
Merge branch 'x86/sev' into x86/boot, to resolve conflicts and to pick up dependent tree
We are going to queue up a number of patches that depend
on fresh changes in x86/sev - merge in that branch to
reduce the number of conflicts going forward.
Also resolve a current conflict with x86/sev.
Conflicts:
arch/x86/include/asm/coco.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/exported-sql-viewer.py')
0 files changed, 0 insertions, 0 deletions