linux-kernel - Re: linux-next: manual merge of the rust tree with the loongarch 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <CANiq72=LaRJK22Z6=KppMea_vk-34-UixTtQKFmjW6EFBytfrQ@mail.gmail.com>
Date: Mon, 31 Mar 2025 09:52:45 +0200
From: Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Miguel Ojeda <ojeda@...nel.org>, Huacai Chen <chenhuacai@...ngson.cn>, 
	Huacai Chen <chenhuacai@...nel.org>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>, Thomas Weißschuh <linux@...ssschuh.net>, 
	WANG Rui <wangrui@...ngson.cn>
Subject: Re: linux-next: manual merge of the rust tree with the loongarch tree

On Mon, Mar 31, 2025 at 7:07 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
>   rust/Makefile
>
> between commit:
>
>   13c23cb4ed09 ("rust: Fix enabling Rust and building with GCC for LoongArch")
>
> from the loongarch tree and commit:
>
>   6b2dab17d6fa ("rust: pass correct target to bindgen on Usermode Linux")
>
> from the rust tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This

Looks good to me, thanks!

Cheers,
Miguel