diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2025-07-28 07:12:53 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-07-28 07:17:38 +0200 |
| commit | 5bf2f5119b9e957f773a22f226974166b58cff32 (patch) | |
| tree | e719f1a52a8c42077cc62ea39da69175d35138c7 /tools/perf/scripts/python/gecko.py | |
| parent | x86/CPU/AMD: Add CPUID faulting support (diff) | |
| parent | Linux 6.16 (diff) | |
| download | wireguard-linux-5bf2f5119b9e957f773a22f226974166b58cff32.tar.xz wireguard-linux-5bf2f5119b9e957f773a22f226974166b58cff32.zip | |
Merge tag 'v6.16' into x86/cpu, to resolve conflict
Resolve overlapping context conflict between this upstream fix:
d8010d4ba43e ("x86/bugs: Add a Transient Scheduler Attacks mitigation")
And this pending commit in tip:x86/cpu:
65f55a301766 ("x86/CPU/AMD: Add CPUID faulting support")
Conflicts:
arch/x86/kernel/cpu/amd.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/gecko.py')
0 files changed, 0 insertions, 0 deletions