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

[Miguel Ojeda]

On Tue, Jan 14, 2025 at 5:37 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
>   rust/kernel/lib.rs
>
> between commit:
>
>   9b90864bb42b ("rust: implement `IdArray`, `IdTable` and `RawDeviceId`")
>
> from the driver-core tree and commit:
>
>   47cb6bf7860c ("rust: use derive(CoercePointee) on rustc >= 1.84.0")
>
> from the rust tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This

Looks good to me, thanks!

Cheers,
Miguel