diff options
| author | Maarten Lankhorst <dev@lankhorst.se> | 2026-06-29 17:58:00 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <dev@lankhorst.se> | 2026-06-29 17:58:00 +0200 |
| commit | 00599d4841790d05401820a96cf7edb193888b00 (patch) | |
| tree | 892401ad6f7973cda18d1ebd75910702611898b4 /rust/kernel/alloc/allocator | |
| parent | 77a9298741f8f9e8b963c977f5582ab21c6d3427 (diff) | |
| parent | dc59e4fea9d83f03bad6bddf3fa2e52491777482 (diff) | |
Merge drm/drm-fixes into drm-misc-fixes
Pull in tag v7.2-rc1 so that drm-misc-fixes becomes useful again,
and drm-misc-next-fixes can be closed.
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
Diffstat (limited to 'rust/kernel/alloc/allocator')
| -rw-r--r-- | rust/kernel/alloc/allocator/iter.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/rust/kernel/alloc/allocator/iter.rs b/rust/kernel/alloc/allocator/iter.rs index e0a70b7a744a..02fda3ea5cae 100644 --- a/rust/kernel/alloc/allocator/iter.rs +++ b/rust/kernel/alloc/allocator/iter.rs @@ -1,9 +1,13 @@ // SPDX-License-Identifier: GPL-2.0 use super::Vmalloc; + use crate::page; -use core::marker::PhantomData; -use core::ptr::NonNull; + +use core::{ + marker::PhantomData, + ptr::NonNull, // +}; /// An [`Iterator`] of [`page::BorrowedPage`] items owned by a [`Vmalloc`] allocation. /// |