public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Shuah Khan <skhan@linuxfoundation•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
	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>,
	Shuah Khan <skhan@linuxfoundation•org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the kunit-next tree
Date: Thu, 15 Oct 2020 11:56:12 -0600	[thread overview]
Message-ID: <05a34f8f-075f-87b0-e13f-898399f480ac@linuxfoundation.org> (raw)
In-Reply-To: <20201015163806.1c5696bb@canb.auug.org.au>

On 10/14/20 11:38 PM, Stephen Rothwell wrote:
> 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.
> 

Thanks Stephen. I will mention this conflict in my pull request to
Linus.

Thanks,
-- Shuah

     prev parent reply	other threads:[~2020-10-15 17:56 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
2020-10-15 17:56   ` Shuah Khan [this message]

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=05a34f8f-075f-87b0-e13f-898399f480ac@linuxfoundation.org \
    --to=skhan@linuxfoundation$(echo .)org \
    --cc=akpm@linux-foundation$(echo .)org \
    --cc=brendanhiggins@google$(echo .)com \
    --cc=davidgow@google$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    --cc=trishalfonso@google$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox