linux-kernel - linux-next: manual merge of the rust-pin-init tree with the rust-fixes 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-next>] [day] [month] [year] [list]

Message-ID: <aW5GPwfJPrQjm-wC@sirena.org.uk>
Date: Mon, 19 Jan 2026 14:57:03 +0000
From: Mark Brown <broonie@...nel.org>
To: Benno Lossin <lossin@...nel.org>
Cc: Gary Guo <gary@...yguo.net>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Miguel Ojeda <ojeda@...nel.org>,
	Tamir Duberstein <tamird@...nel.org>
Subject: linux-next: manual merge of the rust-pin-init tree with the
 rust-fixes tree

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