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 /rust/helpers/helpers.c | |
| parent | 65f55a30176662ee37fe18b47430ee30b57bfc98 (diff) | |
| parent | 038d61fd642278bab63ee8ef722c50d10ab01e8f (diff) | |
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 'rust/helpers/helpers.c')
| -rw-r--r-- | rust/helpers/helpers.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/rust/helpers/helpers.c b/rust/helpers/helpers.c index 16fa9bca5949..b15b3cddad4e 100644 --- a/rust/helpers/helpers.c +++ b/rust/helpers/helpers.c @@ -13,6 +13,7 @@ #include "build_assert.c" #include "build_bug.c" #include "clk.c" +#include "completion.c" #include "cpu.c" #include "cpufreq.c" #include "cpumask.c" |