Re: linux-next: manual merge of the rust tree with the block and kbuild trees

From: Miguel Ojeda
Date: Tue Jul 12 2022 - 06:05:20 EST


Hi Stephen,

On Tue, Jul 12, 2022 at 9:40 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
> Makefile

The resolution looks OK to me. Thank you!

The independent-from-C Rust `opt-level` support is going away on our
side too, so this diff will get smaller too.

Cheers,
Miguel