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

Miguel Ojeda
2025-07-11T09:48:50Z

On Fri, Jul 11, 2025 at 9:59 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
> rust/kernel/pci.rs
>
> between commit:
>
> 4231712c8e98 ("rust: pci: use generic device drvdata accessors")
>
> from the driver-core tree and commit:
>
> fcad9bbf9e1a ("rust: enable `clippy::ptr_as_ptr` lint")
>
> from the rust tree.
>
> I fixed it up (I used the former version) and can carry the fix as

Same as Tamir mentioned for the other one (`platform`): the former
removes the line modified by the latter.

So it looks good -- thanks!

Cheers,
Miguel