diff mbox series

linux-next: manual merge of the kunit-next tree with Linus' tree

Message ID 20231218154521.2394ed2c@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the kunit-next tree with Linus' tree |

Commit Message

Stephen Rothwell Dec. 18, 2023, 4:45 a.m. UTC 
  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.

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.

Comments

Shuah Khan Dec. 18, 2023, 8:41 p.m. UTC | #1 
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
diff mbox series

Patch

diff --cc lib/kunit/test.c
index 7aceb07a1af9,e803d998e855..000000000000
--- a/lib/kunit/test.c