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

[Miguel Ojeda <miguel.ojeda.sandonis@xxxxxxxxx>]

On Fri, Oct 4, 2024 at 6:42 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
>   rust/kernel/types.rs
>
> between commit:
>
>   e7572e5deaf3 ("rust: types: add `NotThreadSafe`")
>
> from the vfs-brauner tree and commits:
>
>   c4277ae2a630 ("rust: types: avoid repetition in `{As,From}Bytes` impls")
>   432526d4ff32 ("rust: enable `clippy::undocumented_unsafe_blocks` lint")
>
> from the rust tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This

Looks good, thanks as usual!

Cheers,
Miguel