linux-kernel - Re: linux-next: duplicate patches in the random 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: <bb8602f1-71f9-438d-91b9-6793250648ea@linuxfoundation.org>
Date: Tue, 9 Jul 2024 12:09:14 -0600
From: Shuah Khan <skhan@...uxfoundation.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Theodore Ts'o <tytso@....edu>,
 "Jason A. Donenfeld" <Jason@...c4.com>, Shuah Khan <shuah@...nel.org>
Cc: John Hubbard <jhubbard@...dia.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>,
 Shuah Khan <skhan@...uxfoundation.org>
Subject: Re: linux-next: duplicate patches in the random tree

On 7/9/24 02:08, Stephen Rothwell wrote:
> Hi all,
> 
> The following commits are also in the kselftest-fixes tree as different
> commits (but the same patches):
> 
>    868680ffba11 ("selftests/vDSO: remove duplicate compiler invocations from Makefile")
>    7bb79ef48b9d ("selftests/vDSO: remove partially duplicated "all:" target in Makefile")
>    14cd1a877fc6 ("selftests/vDSO: fix clang build errors and warnings")
> 
> These are already causing an unnecessary conflict
> :-( Maybe you could just merge the kselftest-fixes tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes),
> but first make sure that it won't be rebased.
> 

They are now in Linus's mainline. :)

thanks,
-- Shuah