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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 5 Sep 2025 12:51:39 +1000

Hi all,

Today's linux-next merge of the drm-rust tree got a conflict in:

  rust/kernel/alloc/allocator.rs

between commit:

  eeefae80e404 ("rust: support large alignments in allocations")

from the mm-unstable tree and commit:

  8e92c9902ff1 ("rust: alloc: vmalloc: implement Vmalloc::to_page()")

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/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.
  ///