[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250905124634.68da9a1e@canb.auug.org.au>
Date: Fri, 5 Sep 2025 12:46:34 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Alice Ryhl <aliceryhl@...gle.com>, Danilo Krummrich <dakr@...nel.org>,
Andrew Morton <akpm@...ux-foundation.org>
Cc: 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: linux-next: manual merge of the drm-rust tree with the mm-unstable
tree
Hi all,
Today's linux-next merge of the drm-rust tree got a conflict in:
rust/kernel/alloc/kbox.rs
between commit:
5efe8a1dcf3b ("rust: add support for NUMA ids in allocations")
from the mm-unstable tree and commit:
671618432f46 ("rust: alloc: kbox: implement AsPageIter for VBox")
from the drm-rust tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
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;
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists