From: Ross Zwisler <zwisler@google.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Steven Rostedt <rostedt@goodmis.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patches in the ftrace tree
Date: Mon, 3 Apr 2023 14:08:11 -0600 [thread overview]
Message-ID: <20230403200811.GA1121882@google.com> (raw)
In-Reply-To: <20230403145115.2849e079@canb.auug.org.au>
On Mon, Apr 03, 2023 at 02:51:15PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> The following commits are also in the mm tree as different commits
> (but the same patches):
>
> 4336cc15b9f7 ("selftests: use canonical ftrace path")
> d1c27c55427e ("leaking_addresses: also skip canonical ftrace path")
> c2f92e8b2d24 ("tools/kvm_stat: use canonical ftrace path")
>
> these are commits
>
> 7dcf5bf9ae8a ("selftests: use canonical ftrace path")
> 4ea6b3463c3e ("leaking_addresses: also skip canonical ftrace path")
> d791c1b3e996 ("tools/kvm_stat: use canonical ftrace path")
>
> in the mm tree.
Thanks, it looks like akpm dropped them from the mm tree, so that conflict
should be resolved.
next prev parent reply other threads:[~2023-04-03 20:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-03 4:51 linux-next: duplicate patches in the ftrace tree Stephen Rothwell
2023-04-03 20:08 ` Ross Zwisler [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-31 22:40 Stephen Rothwell
2025-03-31 23:45 ` Steven Rostedt
2024-09-26 21:54 Stephen Rothwell
2024-09-27 16:59 ` Steven Rostedt
2023-07-14 4:54 Stephen Rothwell
2023-07-14 8:31 ` Masami Hiramatsu
2023-02-24 5:34 Stephen Rothwell
2023-02-24 7:04 ` Masami Hiramatsu
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=20230403200811.GA1121882@google.com \
--to=zwisler@google.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=rostedt@goodmis.org \
--cc=sfr@canb.auug.org.au \
/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).