linux-next: manual merge of the rust-pin-init tree with the rust-fixes tree

linux-next: manual merge of the rust-pin-init tree with the rust-fixes tree

[Mark Brown]

Hi all,

Today's linux-next merge of the rust-pin-init tree got a conflict in:

  scripts/generate_rust_analyzer.py

between commit:

  74e15ac34b098 ("scripts: generate_rust_analyzer: Add pin_init_internal deps")

from the rust-fixes tree and commit:

  514e4ed2c9da9 ("rust: pin-init: add `syn` dependency and remove `proc-macro[2]` and `quote` workarounds")

from the rust-pin-init 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.

diff --cc scripts/generate_rust_analyzer.py
index 3b645da90092c,d31d938886589..0000000000000
--- a/scripts/generate_rust_analyzer.py
+++ b/scripts/generate_rust_analyzer.py

Re: linux-next: manual merge of the rust-pin-init tree with the rust-fixes tree

[Miguel Ojeda]

On Mon, Jan 19, 2026 at 3:57 PM Mark Brown <broonie@kernel.org> wrote:
>
> diff --cc scripts/generate_rust_analyzer.py
> index 3b645da90092c,d31d938886589..0000000000000
> --- a/scripts/generate_rust_analyzer.py
> +++ b/scripts/generate_rust_analyzer.py

It seems the diff is empty :)

I assume you kept all the union of the dependencies from both, i.e.
just using the line from 514e4ed2c9da9?

    ["std", "proc_macro", "proc_macro2", "quote", "syn"],

Thanks!

Cheers,
Miguel

Re: linux-next: manual merge of the rust-pin-init tree with the rust-fixes tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 596 bytes --]

On Mon, Jan 19, 2026 at 04:04:22PM +0100, Miguel Ojeda wrote:
> On Mon, Jan 19, 2026 at 3:57 PM Mark Brown <broonie@kernel.org> wrote:

> > diff --cc scripts/generate_rust_analyzer.py
> > index 3b645da90092c,d31d938886589..0000000000000
> > --- a/scripts/generate_rust_analyzer.py
> > +++ b/scripts/generate_rust_analyzer.py

> It seems the diff is empty :)

> I assume you kept all the union of the dependencies from both, i.e.
> just using the line from 514e4ed2c9da9?

>     ["std", "proc_macro", "proc_macro2", "quote", "syn"],

Yes, that's what git does for a noop change.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]