Re: linux-next: manual merge of the rust-pin-init tree with the rust-fixes tree
From: Mark Brown
Date: Mon Jan 19 2026 - 10:14:07 EST
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@xxxxxxxxxx> 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:
signature.asc
Description: PGP signature