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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Fri, 14 Jul 2023 17:31:26 +0900
From:   Masami Hiramatsu (Google) <mhiramat@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Steven Rostedt <rostedt@...dmis.org>,
        Akanksha J N <akanksha@...ux.ibm.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Shuah Khan <shuah@...nel.org>
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 <sfr@...b.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@...nel.org>