Re: linux-next: manual merge of the rust tree with the arm tree

[Miguel Ojeda]

On Thu, Mar 27, 2025 at 7:21 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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