lkml.org 
[lkml]   [2023]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the kunit-next tree with Linus' tree
From
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


\
 
 \ /
  Last update: 2023-12-18 21:42    [W:0.228 / U:0.256 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site