Skip to contentSkip to conversation

linux-next: manual merge of the kunit-next tree with the kunit-fixes tree

DISCUSSION Stephen Rothwell 2 participants 3 messages Feb 1, 2023 Linux-next tree

lore
Share & tools
lore
#0 lore raw

Hi all,

Today's linux-next merge of the kunit-next tree got a conflict in:

lib/kunit/test.c

between commit:

db105c37a4d6 ("kunit: Export kunit_running()")

from the kunit-fixes tree and commit:

cc3ed2fe5c93 ("kunit: Add "hooks" to call into KUnit when it's built as a module")

from the kunit-next tree.

I fixed it up (the latter incorporated the former) 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.

Signature · 2 lines
Cheers,
Stephen Rothwell
#1 lore raw
Quoted 15 lines · Stephen Rothwell

Hi all,

Today's linux-next merge of the kunit-next tree got a conflict in:

lib/kunit/test.c

between commit:

db105c37a4d6 ("kunit: Export kunit_running()")

from the kunit-fixes tree and commit:

cc3ed2fe5c93 ("kunit: Add "hooks" to call into KUnit when it's built as a module")

Quoted 9 lines

from the kunit-next tree.

I fixed it up (the latter incorporated the former) 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.

Thanks!

As you noted, the "hooks" patch is meant to supersede "kunit: Export kunit_running()", which is really meant as a fix for older kernels which won't get the "hooks" patch.

I imagine we'll rebase this once the fixes go upstream.

Cheers,
-- David

#2 lore raw

Hi David,

Quoted 6 lines · On Wed, 1 Feb 2023 12:31:49 +0800 David Gow <[email protected]> wrote:

As you noted, the "hooks" patch is meant to supersede "kunit: Export kunit_running()", which is really meant as a fix for older kernels which won't get the "hooks" patch.

I imagine we'll rebase this once the fixes go upstream.

Or just merge what you ask Linus to merge, for a minimal change.

Signature · 2 lines
Cheers,
Stephen Rothwell