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

Tamir Duberstein
2025-07-11T09:27:49Z

On Fri, Jul 11, 2025 at 4:04 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the rust tree got a conflict in:
>
> rust/kernel/platform.rs
>
> between commit:
>
> f0a68a912c67 ("rust: platform: 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 just used the former) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

The former version looks correct as it removed the line modified by
the latter version.

Thank you Stephen.