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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20250908175557.7a5dc2e1@canb.auug.org.au>
Date: Mon, 8 Sep 2025 17:55:57 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Miguel Ojeda <ojeda@...nel.org>, Andrew Morton
 <akpm@...ux-foundation.org>
Cc: Alice Ryhl <aliceryhl@...gle.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Vitaly Wool <vitaly.wool@...sulko.se>, Danilo
 Krummrich <dakr@...nel.org>
Subject: Re: linux-next: manual merge of the rust-alloc tree with the
 mm-unstable tree

Hi all,

On Mon, 18 Aug 2025 12:20:53 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the rust-alloc tree got a conflict in:
> 
>   rust/kernel/alloc.rs
> 
> between commit:
> 
>   defab7872312 ("rust: add support for NUMA ids in allocations")
> 
> from the mm-unstable tree and commit:
> 
>   1b1a946dc2b5 ("rust: alloc: specify the minimum alignment of each allocator")
> 
> from the rust-alloc 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.rs
> index b39c279236f5,907301334d8c..000000000000
> --- a/rust/kernel/alloc.rs
> +++ b/rust/kernel/alloc.rs
> @@@ -164,7 -137,15 +164,15 @@@ impl NumaNode 
>   /// - Implementers must ensure that all trait functions abide by the guarantees documented in the
>   ///   `# Guarantees` sections.
>   pub unsafe trait Allocator {
> +     /// The minimum alignment satisfied by all allocations from this allocator.
> +     ///
> +     /// # Guarantees
> +     ///
> +     /// Any pointer allocated by this allocator is guaranteed to be aligned to `MIN_ALIGN` even if
> +     /// the requested layout has a smaller alignment.
> +     const MIN_ALIGN: usize;
> + 
>  -    /// Allocate memory based on `layout` and `flags`.
>  +    /// Allocate memory based on `layout`, `flags` and `nid`.
>       ///
>       /// On success, returns a buffer represented as `NonNull<[u8]>` that satisfies the layout
>       /// constraints (i.e. minimum size and alignment as specified by `layout`).

This is now a conflict between the rust tree and the mm-unstable tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped