[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <DCKQAFNGN8A4.S1VATI4JNP8N@kernel.org>
Date: Fri, 05 Sep 2025 10:36:56 +0200
From: "Danilo Krummrich" <dakr@...nel.org>
To: "Stephen Rothwell" <sfr@...b.auug.org.au>
Cc: "Alice Ryhl" <aliceryhl@...gle.com>, "Andrew Morton"
<akpm@...ux-foundation.org>, "Linux Kernel Mailing List"
<linux-kernel@...r.kernel.org>, "Linux Next Mailing List"
<linux-next@...r.kernel.org>, "Vitaly Wool" <vitaly.wool@...sulko.se>
Subject: Re: linux-next: manual merge of the drm-rust tree with the
mm-unstable tree
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!
Powered by blists - more mailing lists