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

[Miguel Ojeda]

On Mon, Mar 17, 2025 at 10:38 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
>   rust/Makefile
>
> between commit:
>
>   e3de46f775ec ("rust: kbuild: skip `--remap-path-prefix` for `rustdoc`")
>
> from the kbuild tree and commit:
>
>   d7659acca7a3 ("rust: add pin-init crate build infrastructure")
>
> from the rust tree.
>
> 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