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

[Miguel Ojeda]

On Tue, Jul 9, 2024 at 9:53 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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.

Looks good to me, thanks!

Cheers,
Miguel