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

[Miguel Ojeda]

On Mon, Mar 17, 2025 at 11:05 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
>   scripts/generate_rust_analyzer.py
>
> between commits:
>
>   d1f928052439 ("scripts: generate_rust_analyzer: add missing include_dirs")
>   a1eb95d6b5f4 ("scripts: generate_rust_analyzer: add uapi crate")
>
> from Linus' tree and commits:
>
>   d7659acca7a3 ("rust: add pin-init crate build infrastructure")
>   dbd5058ba60c ("rust: make pin-init its own crate")
>
> 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.

Almost good -- there is a missing "pin_init" in the dependencies for
`kernel`, and I think we can put the new crates on top. Please see the
resolution in the last message.

Cheers,
Miguel