public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alice Ryhl <aliceryhl@google•com>, Danilo Krummrich <dakr@kernel•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>,
	Miguel Ojeda <ojeda@kernel•org>
Subject: linux-next: manual merge of the drm-rust tree with Linus' tree
Date: Fri, 5 Sep 2025 12:56:53 +1000	[thread overview]
Message-ID: <20250905125653.0ebc7580@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2743 bytes --]

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;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

next             reply	other threads:[~2025-09-05  2:56 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-05  2:56 Stephen Rothwell [this message]
2025-09-05  8:38 ` linux-next: manual merge of the drm-rust tree with Linus' tree 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=20250905125653.0ebc7580@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --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=ojeda@kernel$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox