From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Shuah Khan <skhan@linuxfoundation.org>,
Brendan Higgins <brendanhiggins@google.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>,
Dan Carpenter <error27@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"YoungJun.park" <her0gyugyu@gmail.com>
Subject: linux-next: manual merge of the kunit-next tree with the kunit-fixes tree
Date: Tue, 1 Nov 2022 14:31:17 +1100 [thread overview]
Message-ID: <20221101143117.07829d4d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 779 bytes --]
Hi all,
Today's linux-next merge of the kunit-next tree got a conflict in:
lib/kunit/string-stream.c
between commit:
618887768bb7 ("kunit: update NULL vs IS_ERR() tests")
from the kunit-fixes tree and commit:
29ad37f740d3 ("kunit: alloc_string_stream_fragment error handling bug fix")
from the kunit-next tree.
I fixed it up (I used the former part of the conflict) 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:[~2022-11-01 3:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-01 3:31 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-02-01 2:49 linux-next: manual merge of the kunit-next tree with the kunit-fixes tree Stephen Rothwell
2023-02-01 4:31 ` David Gow
2023-02-01 5:37 ` 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=20221101143117.07829d4d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=brendanhiggins@google.com \
--cc=dan.carpenter@oracle.com \
--cc=error27@gmail.com \
--cc=her0gyugyu@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).