From: Shuah Khan <skhan@linuxfoundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Brendan Higgins <brendanhiggins@google.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Michal Wajdeczko <michal.wajdeczko@intel.com>,
Rae Moar <rmoar@google.com>,
Shuah Khan <skhan@linuxfoundation.org>
Subject: Re: linux-next: manual merge of the kunit-next tree with Linus' tree
Date: Mon, 18 Dec 2023 13:41:03 -0700 [thread overview]
Message-ID: <e5bd5748-5e4c-432b-be04-ac763c5412b6@linuxfoundation.org> (raw)
In-Reply-To: <20231218154521.2394ed2c@canb.auug.org.au>
On 12/17/23 21:45, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kunit-next tree got a conflict in:
>
> lib/kunit/test.c
>
> between commit:
>
> 2e3c94aed51e ("kunit: Reset suite counter right before running tests")
>
> from Linus' tree and commit:
>
> 6d696c4695c5 ("kunit: add ability to run tests after boot using debugfs")
>
> from the kunit-next tree.
>
Thank you Stephen. It is fixed now.
thanks,
-- Shuah
prev parent reply other threads:[~2023-12-18 20:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-18 4:45 linux-next: manual merge of the kunit-next tree with Linus' tree Stephen Rothwell
2023-12-18 20:41 ` 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=e5bd5748-5e4c-432b-be04-ac763c5412b6@linuxfoundation.org \
--to=skhan@linuxfoundation.org \
--cc=brendanhiggins@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=michal.wajdeczko@intel.com \
--cc=rmoar@google.com \
--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 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).