linux-kernel - Re: linux-next: manual merge of the kselftest tree with the net-next 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: <057fdf09-ef2b-42fa-9300-dd7bf348362c@linuxfoundation.org>
Date: Wed, 8 Jan 2025 16:40:10 -0700
From: Shuah Khan <skhan@...uxfoundation.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Shuah Khan <shuah@...nel.org>,
 David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
 Paolo Abeni <pabeni@...hat.com>
Cc: Networking <netdev@...r.kernel.org>, Laura Nao <laura.nao@...labora.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>,
 Willem de Bruijn <willemb@...gle.com>, Shuah Khan <skhan@...uxfoundation.org>
Subject: Re: linux-next: manual merge of the kselftest tree with the net-next
 tree

On 1/7/25 20:40, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kselftest tree got a conflict in:
> 
>    tools/testing/selftests/kselftest/ktap_helpers.sh
> 
> between commit:
> 
>    912d6f669725 ("selftests/net: packetdrill: report benign debug flakes as xfail")
> 
> from the net-next tree and commit:
> 
>    279e9403c5bd ("selftests: Warn about skipped tests in result summary")
> 
> from the kselftest tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 

Thank you for finding this. I will mention this when I send pr to Linus.

thanks,
-- Shuah