linux-kernel - Re: linux-next: manual merge of the rust tree with the arm 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: <CANiq72n3Tv4eiaedqzV3akJrH+W9oMaPuUPs2MeWqYJj5kOJoQ@mail.gmail.com>
Date: Thu, 27 Mar 2025 14:00:04 +0100
From: Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Miguel Ojeda <ojeda@...nel.org>, Russell King <linux@...linux.org.uk>, 
	Christian Schrefl <chrisi.schrefl@...il.com>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>, Thomas Weißschuh <linux@...ssschuh.net>
Subject: Re: linux-next: manual merge of the rust tree with the arm tree

On Thu, Mar 27, 2025 at 7:21 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:
>
>   ccb8ce526807 ("ARM: 9441/1: rust: Enable Rust support for ARMv7")
>
> from the arm 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! My usual tests are still running, but at
least a couple of them finished. I have yet to add a run for the new
arm, though.

Cheers,
Miguel