From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Steven Rostedt <rostedt@goodmis.org>,
Akanksha J N <akanksha@linux.ibm.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Shuah Khan <shuah@kernel.org>
Subject: Re: linux-next: duplicate patches in the ftrace tree
Date: Fri, 14 Jul 2023 17:31:26 +0900 [thread overview]
Message-ID: <20230714173126.37313c540cc998f5653a6848@kernel.org> (raw)
In-Reply-To: <20230714145404.115c7be1@canb.auug.org.au>
Thanks for the caution!
On Fri, 14 Jul 2023 14:54:04 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
>
> e46ad59233cf ("selftests/ftrace: Add new test case which checks for optimized probes")
> bd2cdc432190 ("selftests/ftrace: Add new test case which adds multiple consecutive probes in a function")
These are only in next-20230714.
>
> These are commits
>
> 5985329c7073 ("selftests/ftrace: Add new test case which checks for optimized probes")
> cf9071dd46e7 ("selftests/ftrace: Add new test case which adds multiple consecutive probes in a function")
I confirmed the latter pair was pushed by my probes-v6.5.
So the latter one should be kept.
Ah, sorry, I missed to update probes/for-next. That caused this issue.
Let me update the probes/for-next branch.
Thank you,
>
> in Linus' tree.
>
> --
> Cheers,
> Stephen Rothwell
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
next prev parent reply other threads:[~2023-07-14 8:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-14 4:54 linux-next: duplicate patches in the ftrace tree Stephen Rothwell
2023-07-14 8:31 ` Masami Hiramatsu [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-04-03 4:51 Stephen Rothwell
2023-04-03 20:08 ` Ross Zwisler
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=20230714173126.37313c540cc998f5653a6848@kernel.org \
--to=mhiramat@kernel.org \
--cc=akanksha@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=sfr@canb.auug.org.au \
--cc=shuah@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