From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Shuah Khan <skhan@linuxfoundation.org>,
Brendan Higgins <brendanhiggins@google.com>
Cc: Arnd Bergmann <arnd@arndb.de>, David Gow <davidgow@google.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the kunit-next tree with the kunit-fixes tree
Date: Wed, 1 Feb 2023 13:49:41 +1100 [thread overview]
Message-ID: <20230201134941.46b02711@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 766 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-02-01 2:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-01 2:49 Stephen Rothwell [this message]
2023-02-01 4:31 ` linux-next: manual merge of the kunit-next tree with the kunit-fixes tree David Gow
2023-02-01 5:37 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-11-01 3:31 Stephen Rothwell
2021-10-08 4:29 Stephen Rothwell
2021-10-08 16:31 ` Shuah Khan
2021-10-08 20:03 ` Brendan Higgins
2021-10-08 20:48 ` Daniel Latypov
2021-10-19 21:26 ` Shuah Khan
2021-10-19 21:40 ` Daniel Latypov
2021-10-19 22:20 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230201134941.46b02711@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=brendanhiggins@google.com \
--cc=davidgow@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=skhan@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.