Subject: linux-next: manual merge of the drm-rust tree with Linus' tree

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

Hi all,

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

  rust/kernel/alloc/allocator_test.rs

between commit:

  0f580d5d3d9d ("rust: alloc: fix `rusttest` by providing `Cmalloc::aligned_layout` too")

from Linus' tree and commit:

  7937dca77039 ("rust: alloc: implement VmallocPageIter")

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_test.rs
index 2e61cdbd2303,f46b4b671389..000000000000
--- a/rust/kernel/alloc/allocator_test.rs
+++ b/rust/kernel/alloc/allocator_test.rs
@@@ -9,11 -9,13 +9,13 @@@
  
  #![allow(missing_docs)]
  
 -use super::{flags::*, AllocError, Allocator, Flags};
 +use super::{flags::*, AllocError, Allocator, Flags, NumaNode};
  use core::alloc::Layout;
  use core::cmp;
+ use core::marker::PhantomData;
  use core::ptr;
  use core::ptr::NonNull;
+ use kernel::page;
  
  /// The userspace allocator based on libc.
  pub struct Cmalloc;
@@@ -22,17 -24,33 +24,44 @@@ pub type Kmalloc = Cmalloc
  pub type Vmalloc = Kmalloc;
  pub type KVmalloc = Kmalloc;
  
 +impl Cmalloc {
 +    /// Returns a [`Layout`] that makes [`Kmalloc`] fulfill the requested size and alignment of
 +    /// `layout`.
 +    pub fn aligned_layout(layout: Layout) -> Layout {
 +        // Note that `layout.size()` (after padding) is guaranteed to be a multiple of
 +        // `layout.align()` which together with the slab guarantees means that `Kmalloc` will return
 +        // a properly aligned object (see comments in `kmalloc()` for more information).
 +        layout.pad_to_align()
 +    }
 +}
 +
+ pub struct VmallocPageIter<'a> {
+     _p: PhantomData<page::BorrowedPage<'a>>,
+ }
+ 
+ impl<'a> Iterator for VmallocPageIter<'a> {
+     type Item = page::BorrowedPage<'a>;
+ 
+     fn next(&mut self) -> Option<Self::Item> {
+         None
+     }
+ }
+ 
+ impl<'a> VmallocPageIter<'a> {
+     #[allow(clippy::missing_safety_doc)]
+     pub unsafe fn new(_buf: NonNull<u8>, _size: usize) -> Self {
+         Self { _p: PhantomData }
+     }
+ 
+     pub fn size(&self) -> usize {
+         0
+     }
+ 
+     pub fn page_count(&self) -> usize {
+         0
+     }
+ }
+ 
  extern "C" {
      #[link_name = "aligned_alloc"]
      fn libc_aligned_alloc(align: usize, size: usize) -> *mut crate::ffi::c_void;