From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alice Ryhl <aliceryhl@google•com>,
Danilo Krummrich <dakr@kernel•org>,
Andrew Morton <akpm@linux-foundation•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Vitaly Wool <vitaly.wool@konsulko•se>
Subject: linux-next: manual merge of the drm-rust tree with the mm-unstable tree
Date: Fri, 5 Sep 2025 12:46:34 +1000 [thread overview]
Message-ID: <20250905124634.68da9a1e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1329 bytes --]
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;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-09-05 2:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-05 2:46 Stephen Rothwell [this message]
2025-09-05 8:24 ` linux-next: manual merge of the drm-rust tree with the mm-unstable tree Danilo Krummrich
-- strict thread matches above, loose matches on Subject: below --
2025-09-05 2:51 Stephen Rothwell
2025-09-05 8:36 ` Danilo Krummrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250905124634.68da9a1e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=aliceryhl@google$(echo .)com \
--cc=dakr@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=vitaly.wool@konsulko$(echo .)se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox