From: broonie@kernel.org
To: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Cc: Alex Gaynor <alex.gaynor@gmail.com>,
Boqun Feng <boqun.feng@gmail.com>, 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>, Sasha Levin <sashal@kernel.org>,
Wedson Almeida Filho <wedsonaf@google.com>
Subject: linux-next: manual merge of the rust tree with the origin tree
Date: Mon, 13 Dec 2021 22:33:34 +0000 [thread overview]
Message-ID: <20211213223334.692590-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the rust tree got a conflict in:
tools/include/linux/lockdep.h
between commit:
3a49cc22d31ec ("tools/lib/lockdep: drop leftover liblockdep headers")
from the origin tree and commit:
ab4cc3d9c564d ("kallsyms: increase maximum kernel symbol length to 512")
from the rust tree.
I fixed it up by removing lockdep.h again 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.
next reply other threads:[~2021-12-13 22:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-13 22:33 broonie [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-03-30 13:17 linux-next: manual merge of the rust tree with the origin tree Mark Brown
2026-03-30 13:26 ` Gary Guo
2026-03-30 13:30 ` Miguel Ojeda
2026-03-30 13:32 ` Miguel Ojeda
2026-04-03 12:35 Mark Brown
2026-04-03 12:53 ` Miguel Ojeda
2026-04-06 13:02 Mark Brown
2026-04-06 13:11 ` Miguel Ojeda
2026-04-06 13:14 ` Mark Brown
2026-04-06 13:12 Mark Brown
2026-04-06 13:15 ` Miguel Ojeda
2026-04-06 13:13 Mark Brown
2026-04-06 13:16 ` Miguel Ojeda
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=20211213223334.692590-1-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=alex.gaynor@gmail.com \
--cc=boqun.feng@gmail.com \
--cc=gary@garyguo.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=miguel.ojeda.sandonis@gmail.com \
--cc=ojeda@kernel.org \
--cc=sashal@kernel.org \
--cc=wedsonaf@google.com \
/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