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]

Message-ID: <20230403200811.GA1121882@google.com>
Date:   Mon, 3 Apr 2023 14:08:11 -0600
From:   Ross Zwisler <zwisler@...gle.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Steven Rostedt <rostedt@...dmis.org>,
        Masami Hiramatsu <mhiramat@...nel.org>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: duplicate patches in the ftrace tree

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.