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

[Miguel Ojeda]

On Mon, Mar 31, 2025 at 7:07 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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