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

Miguel Ojeda
2024-12-18T00:18:52Z

On Tue, Dec 17, 2024 at 4:10 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I fixed it up (see below) 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.

Sorry, I missed to reply earlier, but this looked good to me too.

Thanks!

Cheers,
Miguel