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

[Miguel Ojeda]

On Thu, Oct 15, 2026 at 4:33 PM Mark Brown <broonie@xxxxxxxxxx> wrote:
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
>   rust/kernel/miscdevice.rs
>
> between commit:
>
>   a4082121eeb5c ("rust: miscdevice: use `#[optional]` attribute of `#[vtable]` macro")
>
> from the rust tree and commit:
>
>   ba9d2c7ea7f8f ("rust: miscdevice: add registration data to MiscDevice")
>
> from the char-misc tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This

Looks good, thanks Mark.

Cheers,
Miguel