diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-02-22 12:11:38 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-02-22 12:16:53 +0300 |
| commit | f14df823a61e45db6a92e1caf552d5ec64e06b1e (patch) | |
| tree | 61d480a97a060998c0c3e7da44bc3933d3924683 /tools/perf/scripts/python/export-to-sqlite.py | |
| parent | b388e57d4628eb22782bdad4cd5b83ca87a1b7c9 (diff) | |
| parent | 289d0a475c3e5be42315376d08e0457350fb8e9c (diff) | |
| download | linux-f14df823a61e45db6a92e1caf552d5ec64e06b1e.tar.xz | |
Merge branch 'x86/vdso' into x86/core, to resolve conflict and to prepare for dependent changes
Conflicts:
arch/x86/entry/vdso/Makefile
We also want to change arch/x86/entry/vdso/Makefile in a followup
commit, so merge the trees for this.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/export-to-sqlite.py')
0 files changed, 0 insertions, 0 deletions