[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <DCKQ198SF1ND.11RHS48BPS4DX@kernel.org>
Date: Fri, 05 Sep 2025 10:24:57 +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:46 AM CEST, Stephen Rothwell wrote:
> diff --cc rust/kernel/alloc/kbox.rs
> index 1fef9beb57c8,b69ff4a1d748..000000000000
> --- a/rust/kernel/alloc/kbox.rs
> +++ b/rust/kernel/alloc/kbox.rs
> @@@ -3,8 -3,8 +3,8 @@@
> //! Implementation of [`Box`].
>
> #[allow(unused_imports)] // Used in doc comments.
> - use super::allocator::{KVmalloc, Kmalloc, Vmalloc};
> + use super::allocator::{KVmalloc, Kmalloc, Vmalloc, VmallocPageIter};
> -use super::{AllocError, Allocator, Flags};
> +use super::{AllocError, Allocator, Flags, NumaNode};
> use core::alloc::Layout;
> use core::borrow::{Borrow, BorrowMut};
> use core::fmt;
Looks good, thanks!
Powered by blists - more mailing lists