From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Paul E. McKenney" <paulmck@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
Masami Hiramatsu <mhiramat@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: duplicate patches in the rcu tree
Date: Wed, 27 Sep 2023 11:53:30 +1000 [thread overview]
Message-ID: <20230927115330.69ef6671@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
Hi all,
The following commits are also in the ftrace tree as different commits
(but similar patches):
8f2612479c71 ("doc: Add /proc/bootconfig to proc.rst")
648c895fda8d ("doc: Update /proc/cmdline documentation to include boot config")
These are commits
5f4028880652 ("doc: Add /proc/bootconfig to proc.rst")
6eab72b5fea3 ("doc: Update /proc/cmdline documentation to include boot config")
in the ftrace tree. They are causing a conflict due to the differences.
I am guessing that the commits in the ftrace tree are an older verison?
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-09-27 2:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-27 1:53 Stephen Rothwell [this message]
2023-10-02 15:41 ` linux-next: duplicate patches in the rcu tree Steven Rostedt
2023-10-05 17:19 ` Paul E. McKenney
-- strict thread matches above, loose matches on Subject: below --
2024-04-11 6:46 Stephen Rothwell
2024-04-12 4:20 ` Paul E. McKenney
2023-01-24 1:01 Stephen Rothwell
2023-01-24 4:48 ` Paul E. McKenney
2023-01-06 0:56 Stephen Rothwell
2023-01-06 1:17 ` Paul E. McKenney
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=20230927115330.69ef6671@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=paulmck@kernel.org \
--cc=rostedt@goodmis.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