linux-kernel - Re: linux-next: manual merge of the rust-alloc tree with the mm-unstable tree and Linus' 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: <CANiq72mzK6BifSn+tWK090U1VO2FS2J5WQvX5O48D0MRDiSs2w@mail.gmail.com>
Date: Tue, 26 Aug 2025 10:41:06 +0200
From: Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Danilo Krummrich <dakr@...nel.org>, Andrew Morton <akpm@...ux-foundation.org>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>, Miguel Ojeda <ojeda@...nel.org>, 
	Vitaly Wool <vitaly.wool@...sulko.se>
Subject: Re: linux-next: manual merge of the rust-alloc tree with the
 mm-unstable tree and Linus' tree.

On Tue, Aug 26, 2025 at 9:30 AM 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/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.

That's correct -- the file is going away. Thanks!

Cheers,
Miguel