diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2025-10-28 15:04:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-10-29 08:42:28 +0100 |
| commit | 977b9a00541929973fddfbc2f5e932469f7cdc81 (patch) | |
| tree | 50885bdc977a6fa822b5419114e4ea44cfc1d480 /rust/kernel/alloc | |
| parent | af13e5e437dc2eb8a3291aad70fc80d9cc78bc73 (diff) | |
| parent | fd57572253bc356330dbe5b233c2e1d8426c66fd (diff) | |
| download | linux-977b9a00541929973fddfbc2f5e932469f7cdc81.tar.gz linux-977b9a00541929973fddfbc2f5e932469f7cdc81.zip | |
Merge branch 'linus/master' into sched/core, to resolve conflict
Conflicts:
kernel/sched/ext.c
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'rust/kernel/alloc')
| -rw-r--r-- | rust/kernel/alloc/kvec.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/kernel/alloc/kvec.rs b/rust/kernel/alloc/kvec.rs index e94aebd084c8..ac8d6f763ae8 100644 --- a/rust/kernel/alloc/kvec.rs +++ b/rust/kernel/alloc/kvec.rs @@ -9,7 +9,7 @@ use super::{ }; use crate::{ fmt, - page::AsPageIter, + page::AsPageIter, // }; use core::{ borrow::{Borrow, BorrowMut}, |