* for-4.15/block rebased
@ 2017-11-11 3:02 Jens Axboe
2017-11-11 9:07 ` Christoph Hellwig
0 siblings, 1 reply; 3+ messages in thread
From: Jens Axboe @ 2017-11-11 3:02 UTC (permalink / raw)
To: linux-block@vger.kernel.org
Hi,
Just a heads up that due to a fuckup of mine, I have rebased the above
mentioned branch. The code is the same, but the history was screwed up.
Not great timing coming up on the merge window, but it is what it is...
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: for-4.15/block rebased
2017-11-11 3:02 for-4.15/block rebased Jens Axboe
@ 2017-11-11 9:07 ` Christoph Hellwig
2017-11-11 22:37 ` Jens Axboe
0 siblings, 1 reply; 3+ messages in thread
From: Christoph Hellwig @ 2017-11-11 9:07 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-block
Yikes. Can you at least re-pull the nvme bits so we can keep
the original commit dates for those? Those actually are a huge
part of the rebased commits, and that way we might not get Linus
shouting at us this merge window at least..
On Fri, Nov 10, 2017 at 08:02:00PM -0700, Jens Axboe wrote:
> Hi,
>
> Just a heads up that due to a fuckup of mine, I have rebased the above
> mentioned branch. The code is the same, but the history was screwed up.
> Not great timing coming up on the merge window, but it is what it is...
>
> --
> Jens Axboe
>
---end quoted text---
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: for-4.15/block rebased
2017-11-11 9:07 ` Christoph Hellwig
@ 2017-11-11 22:37 ` Jens Axboe
0 siblings, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2017-11-11 22:37 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-block
On 11/11/2017 02:07 AM, Christoph Hellwig wrote:
> Yikes. Can you at least re-pull the nvme bits so we can keep
> the original commit dates for those? Those actually are a huge
> part of the rebased commits, and that way we might not get Linus
> shouting at us this merge window at least..
I'm just going to explain my way out of this one instead, I don't
want to do yet another one a day or two before I send it in.
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-11 22:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-11 3:02 for-4.15/block rebased Jens Axboe
2017-11-11 9:07 ` Christoph Hellwig
2017-11-11 22:37 ` Jens Axboe
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).