From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miguel Ojeda <ojeda@kernel•org>,
Andrew Morton <akpm@linux-foundation•org>
Cc: Alice Ryhl <aliceryhl@google•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Vitaly Wool <vitaly.wool@konsulko•se>,
Danilo Krummrich <dakr@kernel•org>
Subject: Re: linux-next: manual merge of the rust-alloc tree with the mm-unstable tree
Date: Mon, 8 Sep 2025 17:55:57 +1000 [thread overview]
Message-ID: <20250908175557.7a5dc2e1@canb.auug.org.au> (raw)
In-Reply-To: <20250818122053.355aab17@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1992 bytes --]
Hi all,
On Mon, 18 Aug 2025 12:20:53 +1000 Stephen Rothwell <sfr@canb•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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2025-09-08 7:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-18 2:20 linux-next: manual merge of the rust-alloc tree with the mm-unstable tree Stephen Rothwell
2025-09-08 7:55 ` Stephen Rothwell [this message]
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=20250908175557.7a5dc2e1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--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 \
--cc=vitaly.wool@konsulko$(echo .)se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox