linux-kernel - Re: linux-next: manual merge of the kunit-next tree with Linus' 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: Mon, 18 Dec 2023 13:41:03 -0700
From: Shuah Khan <skhan@...uxfoundation.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
 Brendan Higgins <brendanhiggins@...gle.com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>,
 Michal Wajdeczko <michal.wajdeczko@...el.com>, Rae Moar <rmoar@...gle.com>,
 Shuah Khan <skhan@...uxfoundation.org>
Subject: Re: linux-next: manual merge of the kunit-next tree with Linus' tree

On 12/17/23 21:45, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kunit-next tree got a conflict in:
> 
>    lib/kunit/test.c
> 
> between commit:
> 
>    2e3c94aed51e ("kunit: Reset suite counter right before running tests")
> 
> from Linus' tree and commit:
> 
>    6d696c4695c5 ("kunit: add ability to run tests after boot using debugfs")
> 
> from the kunit-next tree.
> 

Thank you Stephen. It is fixed now.

thanks,
-- Shuah