Re: linux-next: manual merge of the drm-rust tree with the mm-unstable tree

[Danilo Krummrich]

On Fri Sep 5, 2025 at 4:51 AM CEST, Stephen Rothwell wrote:
> diff --cc rust/kernel/alloc/allocator.rs
> index b561e7a57bb8,90e03ad15760..000000000000
> --- a/rust/kernel/alloc/allocator.rs
> +++ b/rust/kernel/alloc/allocator.rs
> @@@ -13,8 -13,13 +13,12 @@@ use core::alloc::Layout
>   use core::ptr;
>   use core::ptr::NonNull;
>   
>  -use crate::alloc::{AllocError, Allocator};
>  +use crate::alloc::{AllocError, Allocator, NumaNode};
>   use crate::bindings;
> + use crate::page;
>  -use crate::pr_warn;
> + 
> + mod iter;
> + pub use self::iter::VmallocPageIter;
>   
>   /// The contiguous kernel allocator.
>   ///

Looks good, thanks!