* linux-next: rebase of the scsi-mkp tree
@ 2021-03-05 0:04 Stephen Rothwell
2021-03-05 0:21 ` James Bottomley
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2021-03-05 0:04 UTC (permalink / raw)
To: Martin K. Petersen
Cc: James Bottomley, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 345 bytes --]
Hi Martin,
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: rebase of the scsi-mkp tree
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
0 siblings, 1 reply; 3+ messages in thread
From: James Bottomley @ 2021-03-05 0:21 UTC (permalink / raw)
To: Stephen Rothwell, Martin K. Petersen
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 525 bytes --]
On Fri, 2021-03-05 at 11:04 +1100, Stephen Rothwell wrote:
> Hi Martin,
>
> 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.
James
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: rebase of the scsi-mkp tree
2021-03-05 0:21 ` James Bottomley
@ 2021-03-05 0:32 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2021-03-05 0:32 UTC (permalink / raw)
To: James Bottomley
Cc: Martin K. Petersen, Linux Kernel Mailing List,
Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-05 0:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox