diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-04-11 15:46:05 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-04-12 13:11:45 +0300 |
| commit | 21f546a43a918ed1cc3bf99ac094107139cf3f33 (patch) | |
| tree | 06a1131d97e14a162d96de26bd588aedae754f36 /tools/perf/scripts/python/export-to-sqlite.py | |
| parent | dbbe13a6f66b228a2867844ad4dd108576134775 (diff) | |
| parent | 7211274fe0ee352332255e41ab5e628b86e83994 (diff) | |
| download | linux-21f546a43a918ed1cc3bf99ac094107139cf3f33.tar.xz | |
Merge branch 'x86/urgent' into x86/cpu, to resolve conflict
There's a new conflict between this commit pending in x86/cpu:
63edbaa48a57 x86/cpu/topology: Add support for the AMD 0x80000026 leaf
And these fixes in x86/urgent:
c064b536a8f9 x86/cpu/amd: Make the NODEID_MSR union actually work
1b3108f6898e x86/cpu/amd: Make the CPUID 0x80000008 parser correct
Resolve them.
Conflicts:
arch/x86/kernel/cpu/topology_amd.c
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