diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2022-03-15 12:52:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-03-15 12:52:51 +0100 |
| commit | 9cea0d46f52f31c077a83a9b9e4e3887adfbecbe (patch) | |
| tree | 3910cec9563476f23108de6618ad55cf0c87e62a /tools/perf/scripts/python/export-to-sqlite.py | |
| parent | Merge branch 'x86/pasid' into x86/core, to resolve conflicts (diff) | |
| parent | x86/cpu: Clear SME feature flag when not in use (diff) | |
| download | linux-dev-9cea0d46f52f31c077a83a9b9e4e3887adfbecbe.tar.xz linux-dev-9cea0d46f52f31c077a83a9b9e4e3887adfbecbe.zip | |
Merge branch 'x86/cpu' into x86/core, to resolve conflicts
Conflicts:
arch/x86/include/asm/cpufeatures.h
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