Subject: linux-next: manual merge of the drm tree with the origin tree

From: Mark Brown <[email-masked]>
Date: Thu, 2 Oct 2025 13:05:46 +0100

Hi all,

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

  rust/kernel/alloc/allocator.rs

between commit:

  1b1a946dc2b53 ("rust: alloc: specify the minimum alignment of each allocator")

from the origin tree and commits:

  1738796994a43 ("rust: support large alignments in allocations")
  8e92c9902ff11 ("rust: alloc: vmalloc: implement Vmalloc::to_page()")

from the drm 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.

diff --cc rust/kernel/alloc/allocator.rs
index 6426ba54cf98d,84ee7e9d7b0eb..0000000000000
--- a/rust/kernel/alloc/allocator.rs
+++ b/rust/kernel/alloc/allocator.rs
@@@ -13,11 -13,14 +13,15 @@@ 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;
 +
 +const ARCH_KMALLOC_MINALIGN: usize = bindings::ARCH_KMALLOC_MINALIGN;
  
+ mod iter;
+ pub use self::iter::VmallocPageIter;
+ 
  /// The contiguous kernel allocator.
  ///
  /// `Kmalloc` is typically used for physically contiguous allocations up to page size, but also