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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CANiq72kDZDsVLraCe9n6kUGKC6BT1825Y4ejhEiLg11B5hOQBg@mail.gmail.com>
Date: Mon, 17 Mar 2025 20:36:54 +0100
From: Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Miguel Ojeda <ojeda@...nel.org>, Benno Lossin <benno.lossin@...ton.me>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>, Tamir Duberstein <tamird@...il.com>
Subject: Re: linux-next: manual merge of the rust tree with Linus' tree

On Mon, Mar 17, 2025 at 11:05 AM Stephen Rothwell <sfr@...b.auug.org.au> 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