diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2025-05-06 09:59:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-06 10:00:58 +0200 |
| commit | 24035886d735e4ce1c4605638adafe1fa2988e7a (patch) | |
| tree | 8c75625bc848a16bde8ce69e902c70c28e7d3da7 /rust/helpers/helpers.c | |
| parent | x86/cpufeatures: Shorten X86_FEATURE_AMD_HETEROGENEOUS_CORES (diff) | |
| parent | Linux 6.15-rc5 (diff) | |
| download | wireguard-linux-24035886d735e4ce1c4605638adafe1fa2988e7a.tar.xz wireguard-linux-24035886d735e4ce1c4605638adafe1fa2988e7a.zip | |
Merge tag 'v6.15-rc5' into x86/cpu, to resolve conflicts
Conflicts:
tools/arch/x86/include/asm/cpufeatures.h
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 e1c21eba9b15..1e7c84df7252 100644 --- a/rust/helpers/helpers.c +++ b/rust/helpers/helpers.c @@ -14,6 +14,7 @@ #include "cpumask.c" #include "cred.c" #include "device.c" +#include "dma.c" #include "err.c" #include "fs.c" #include "io.c" |