From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Shuah Khan <skhan@linuxfoundation.org>,
Brendan Higgins <brendanhiggins@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
David Gow <davidgow@google.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Patricia Alfonso <trishalfonso@google.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the kunit-next tree
Date: Thu, 15 Oct 2020 16:38:06 +1100 [thread overview]
Message-ID: <20201015163806.1c5696bb@canb.auug.org.au> (raw)
In-Reply-To: <20201012195649.2047671f@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]
Hi all,
On Mon, 12 Oct 2020 19:56:49 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> lib/kunit/test.c
>
> between commit:
>
> 45dcbb6f5ef7 ("kunit: test: add test plan to KUnit TAP format")
>
> from the kunit-next tree and commit:
>
> e685acc91080 ("KUnit: KASAN Integration")
>
> from the akpm-current 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.
>
> diff --cc lib/kunit/test.c
> index de07876b6601,dcc35fd30d95..000000000000
> --- a/lib/kunit/test.c
> +++ b/lib/kunit/test.c
> @@@ -15,11 -16,16 +16,6 @@@
> #include "string-stream.h"
> #include "try-catch-impl.h"
>
> - static void kunit_set_failure(struct kunit *test)
> -static void kunit_print_tap_version(void)
> --{
> - WRITE_ONCE(test->success, false);
> - static bool kunit_has_printed_tap_version;
> -
> - if (!kunit_has_printed_tap_version) {
> - pr_info("TAP version 14\n");
> - kunit_has_printed_tap_version = true;
> - }
> --}
> --
> /*
> * Append formatted message to log, size of which is limited to
> * KUNIT_LOG_SIZE bytes (including null terminating byte).
This is now a conflict between the kunit-next tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-10-15 5:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 8:56 linux-next: manual merge of the akpm-current tree with the kunit-next tree Stephen Rothwell
2020-10-15 5:38 ` Stephen Rothwell [this message]
2020-10-15 17:56 ` Shuah Khan
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=20201015163806.1c5696bb@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=brendanhiggins@google.com \
--cc=davidgow@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=trishalfonso@google.com \
/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).