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

[Miguel Ojeda]

On Tue, Jan 14, 2025 at 5:46 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
>   rust/kernel/miscdevice.rs
>
> between commit:
>
>   88441d5c6d17 ("rust: miscdevice: access the `struct miscdevice` from fops->open()")
>
> from the driver-core tree and commit:
>
>   14686571a914 ("rust: kernel: change `ForeignOwnable` pointer to mut")
>
> from the rust tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This

Looks good to me as well, thanks!

Cheers,
Miguel