2023-07-14 05:10:44

by Stephen Rothwell

[permalink] [raw]

Subject: linux-next: duplicate patches in the ftrace tree

---

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 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")

in Linus' tree.

--
Cheers,
Stephen Rothwell

---

Attachments:

(No filename) (499.00 B)
OpenPGP digital signature

2023-07-14 08:44:10

by Masami Hiramatsu

[permalink] [raw]

Subject: Re: linux-next: duplicate patches in the ftrace tree

---

Thanks for the caution!

On Fri, 14 Jul 2023 14:54:04 +1000
Stephen Rothwell <[email protected]> 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) <[email protected]>