From: Mark Brown <broonie@kernel.org>
To: Benno Lossin <lossin@kernel.org>
Cc: Gary Guo <gary@garyguo.net>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Miguel Ojeda <ojeda@kernel.org>,
Tamir Duberstein <tamird@kernel.org>
Subject: linux-next: manual merge of the rust-pin-init tree with the rust-fixes tree
Date: Mon, 19 Jan 2026 14:57:03 +0000 [thread overview]
Message-ID: <aW5GPwfJPrQjm-wC@sirena.org.uk> (raw)
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
next reply other threads:[~2026-01-19 14:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-19 14:57 Mark Brown [this message]
2026-01-19 15:04 ` linux-next: manual merge of the rust-pin-init tree with the rust-fixes tree Miguel Ojeda
2026-01-19 15:14 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aW5GPwfJPrQjm-wC@sirena.org.uk \
--to=broonie@kernel.org \
--cc=gary@garyguo.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lossin@kernel.org \
--cc=ojeda@kernel.org \
--cc=tamird@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox