Messages in this thread | | | Date | Mon, 18 Dec 2023 13:41:03 -0700 | Subject | Re: linux-next: manual merge of the kunit-next tree with Linus' tree | From | Shuah Khan <> |
| |
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
| |