linux-kernel - Re: linux-next: duplicate patches in the perf 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20240905084208.78279c14@canb.auug.org.au>
Date: Thu, 5 Sep 2024 08:42:08 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Arnaldo Carvalho de Melo <arnaldo.melo@...il.com>, Namhyung Kim
 <namhyung@...nel.org>
Cc: 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 perf tree

Hi all,

On Mon, 2 Sep 2024 10:51:21 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> The following commits are also in the perf-current tree as different
> commits (but the same patches):
> 
>   6236ebe07131 ("perf daemon: Fix the build on more 32-bit architectures")
>   2518e13275ab ("perf python: Fix the build on 32-bit arm by including missing "util/sample.h"")
>   74fd69a35cae ("perf lock contention: Fix spinlock and rwlock accounting")
>   37e2a19c98bf ("perf test pmu: Set uninitialized PMU alias to null")
> 
> These are commits
> 
>   478e3c7ebbe7 ("perf daemon: Fix the build on more 32-bit architectures")
>   4cb80590f12d ("perf python: include "util/sample.h"")
>   60f47d2c58cb ("perf lock contention: Fix spinlock and rwlock accounting")
>   387ad33e5410 ("perf test pmu: Set uninitialized PMU alias to null")
> 
> and this last one is causing an unnecessary conflict.

These latter commits are now in Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped