From: Stephen Rothwell <sfr@rothwell.id.au>
To: Shuah Khan <skhan@linuxfoundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Daniel Latypov <dlatypov@google.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Brendan Higgins <brendanhiggins@google.com>
Subject: Re: linux-next: manual merge of the kunit-next tree with the kunit-fixes tree
Date: Wed, 20 Oct 2021 09:20:23 +1100 [thread overview]
Message-ID: <20211020092023.0a9a43f4@elm.ozlabs.ibm.com> (raw)
In-Reply-To: <009188fd-a744-fb50-a9d2-ca1ce9b7905f@linuxfoundation.org>
[-- Attachment #1: Type: text/plain, Size: 594 bytes --]
Hi Shuah,
On Tue, 19 Oct 2021 15:26:40 -0600 Shuah Khan <skhan@linuxfoundation.org> wrote:
>
> I fixed the merge conflict in kunit-next tree after rebase to Linux 5.15-rc6.
> There is no need to carry this fix.
>
> Daniel! Please review to see if it looks good. It was very minor fix-up.
There was really no need to rebase. A simple merge of the kunit-fixes
tree into the kunit-next tree would has sufficed, maintained history
and allowed a place for an explanation. Or you could have mentioned
the conflict to Linus during the merge window.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-10-19 22:20 UTC|newest]
Thread overview: 11+ 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
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 [this message]
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
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=20211020092023.0a9a43f4@elm.ozlabs.ibm.com \
--to=sfr@rothwell.id.au \
--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 \
--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).