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

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

[Stephen Rothwell]

[-- 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 --]

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

[Stephen Rothwell]

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

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

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

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

[Danilo Krummrich]

On Fri Sep 5, 2025 at 4:46 AM CEST, Stephen Rothwell wrote:
> 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;

Looks good, thanks!

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

[Danilo Krummrich]

On Fri Sep 5, 2025 at 4:51 AM CEST, Stephen Rothwell wrote:
> 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.
>   ///

Looks good, thanks!