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

[Miguel Ojeda]

On Tue, Nov 4, 2025 at 12:55 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
>   rust/kernel/str.rs
>
> between commit:
>
>   51d9ee90ea90 ("rust: str: add radix prefixed integer parsing functions")
>
> from the modules tree and commit:
>
>   3b83f5d5e78a ("rust: replace `CStr` with `core::ffi::CStr`")
>
> from the rust tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This

Looks good, thanks!

Cheers,
Miguel