From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Miguel Ojeda <ojeda@kernel•org>
Cc: Danilo Krummrich <dakr@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Vitaly Wool <vitaly.wool@konsulko•se>
Subject: Re: linux-next: manual merge of the rust-alloc tree with the mm-unstable tree and Linus' tree.
Date: Mon, 8 Sep 2025 17:57:28 +1000 [thread overview]
Message-ID: <20250908175728.3001c2f4@canb.auug.org.au> (raw)
In-Reply-To: <20250826173041.3140da7b@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1147 bytes --]
Hi all,
On Tue, 26 Aug 2025 17:30:41 +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/allocator_test.rs
>
> between commits:
>
> 501046225a67 ("rust: alloc: fix missing import needed for `rusttest`")
> c8a3b6ec0370 ("rust: add support for NUMA ids in allocations")
>
> from the mm-unstable tree and
>
> 0f580d5d3d9d ("rust: alloc: fix `rusttest` by providing `Cmalloc::aligned_layout` too")
>
> from Linus' tree and commit:
>
> fe927defbb4f ("rust: alloc: remove `allocator_test`")
>
> from the rust-alloc tree.
>
> I fixed it up (I removed the file) 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.
This is now a conflict between the rust tree and Linus' 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:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-26 7:30 linux-next: manual merge of the rust-alloc tree with the mm-unstable tree and Linus' tree Stephen Rothwell
2025-08-26 8:41 ` Miguel Ojeda
2025-09-08 7:57 ` 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=20250908175728.3001c2f4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--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