From: Stephen Rothwell <sfr@canb•auug.org.au>
To: James Bottomley <James.Bottomley@HansenPartnership•com>
Cc: "Martin K. Petersen" <martin.petersen@oracle•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: rebase of the scsi-mkp tree
Date: Fri, 5 Mar 2021 11:32:12 +1100 [thread overview]
Message-ID: <20210305113212.66f8f965@canb.auug.org.au> (raw)
In-Reply-To: <9a15538c1cc29270d306a4fff6fd9089c9ca56ec.camel@HansenPartnership.com>
[-- Attachment #1: Type: text/plain, Size: 682 bytes --]
Hi James,
On Thu, 04 Mar 2021 16:21:20 -0800 James Bottomley <James.Bottomley@HansenPartnership•com> wrote:
>
> On Fri, 2021-03-05 at 11:04 +1100, Stephen Rothwell wrote:
> >
> > I notice that you have rebased the scsi-mkp tree. Unfotunately James
> > has already merged part of the old version of the scsi-mkp tree int
> > the scsi tree so that commits f69d02e37a85..39ae3edda325 in the scsi-
> > mkp tree are the same patches as commits fe07bfda2fb9..100d21c4ff29
> > in the scsi tree.
>
> It's just the flux from Linus announcing he's screwed up -rc1 and we
> shouldn't base on it ... it should all be fixed soon.
Thanks.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2021-03-05 0:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-05 0:04 linux-next: rebase of the scsi-mkp tree Stephen Rothwell
2021-03-05 0:21 ` James Bottomley
2021-03-05 0:32 ` Stephen Rothwell [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=20210305113212.66f8f965@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=martin.petersen@oracle$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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