All of lore.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: Daniel Latypov <dlatypov@google.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Shuah Khan <skhan@linuxfoundation.org>
Subject: Re: linux-next: manual merge of the kunit-next tree with the kunit-fixes tree
Date: Fri, 8 Oct 2021 10:31:50 -0600	[thread overview]
Message-ID: <ba01fb13-e1a1-299e-9a7b-ccdeaeef267a@linuxfoundation.org> (raw)
In-Reply-To: <20211008152930.03787395@canb.auug.org.au>

On 10/7/21 10:29 PM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kunit-next tree got a conflict in:
> 
>    tools/testing/kunit/kunit.py
> 
> between commit:
> 
>    d8c23ead708b ("kunit: tool: better handling of quasi-bool args (--json, --raw_output)")
> 
> from the kunit-fixes tree and commit:
> 
>    6710951ee039 ("kunit: tool: support running each suite/test separately")
> 
> from the kunit-next 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.
> 

Thank you for the fixing it up. I will fix this up in the kunit-next once
the kunit-fixes pull request goes out.

thanks,
-- Shuah

  reply	other threads:[~2021-10-08 16:31 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-08  4:29 linux-next: manual merge of the kunit-next tree with the kunit-fixes tree Stephen Rothwell
2021-10-08 16:31 ` Shuah Khan [this message]
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
  -- strict thread matches above, loose matches on Subject: below --
2022-11-01  3:31 Stephen Rothwell
2023-02-01  2:49 Stephen Rothwell
2023-02-01  4:31 ` David Gow
2023-02-01  5:37   ` Stephen Rothwell
2026-03-03 14:00 Mark Brown
2026-03-04  9:16 ` David Gow
2026-03-31 19:36   ` Shuah Khan
2026-04-01 10:33     ` Mark Brown

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=ba01fb13-e1a1-299e-9a7b-ccdeaeef267a@linuxfoundation.org \
    --to=skhan@linuxfoundation.org \
    --cc=brendanhiggins@google.com \
    --cc=dlatypov@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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.