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 Linus' tree
Date: Fri, 10 Dec 2021 18:18:24 +0000 [thread overview]
Message-ID: <20211210181824.3710591-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 (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.
next reply other threads:[~2021-12-10 18:18 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-10 18:18 broonie [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-21 4:31 linux-next: manual merge of the rust tree with Linus' tree Stephen Rothwell
2025-07-21 8:23 ` Miguel Ojeda
2025-03-17 10:20 Stephen Rothwell
2025-03-17 19:37 ` Miguel Ojeda
2025-03-17 22:31 ` Stephen Rothwell
2025-03-17 22:35 ` Miguel Ojeda
2025-03-17 10:05 Stephen Rothwell
2025-03-17 19:36 ` Miguel Ojeda
2024-09-16 8:03 Stephen Rothwell
2024-09-16 8:12 ` Miguel Ojeda
2022-10-04 8:05 Stephen Rothwell
2022-09-12 7:24 Stephen Rothwell
2022-07-25 8:41 Stephen Rothwell
2022-07-25 8:52 ` Miguel Ojeda
2022-07-13 10:34 Stephen Rothwell
2022-07-13 10:50 ` Miguel Ojeda
2022-07-13 11:39 ` Peter Zijlstra
2022-07-15 1:13 ` Miguel Ojeda
2022-07-15 9:01 ` Peter Zijlstra
2022-07-15 11:01 ` Miguel Ojeda
2021-11-03 3:19 Stephen Rothwell
2021-11-03 10:30 ` Miguel Ojeda
2021-11-03 21:01 ` Stephen Rothwell
2021-11-04 12:19 ` Miguel Ojeda
2021-11-04 20:31 ` Stephen Rothwell
2021-11-05 11:00 ` Miguel Ojeda
2021-07-19 6:16 Stephen Rothwell
2021-07-12 0:37 Stephen Rothwell
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=20211210181824.3710591-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;
as well as URLs for NNTP newsgroup(s).