Re: linux-next: manual merge of the block tree with Linus' tree

From: Jens Axboe
Date: Thu Jun 22 2017 - 23:29:29 EST


On 06/22/2017 09:24 PM, Stephen Rothwell wrote:
> Hi Jens,
>
> On Thu, 22 Jun 2017 21:09:22 -0600 Jens Axboe <axboe@xxxxxxxxx> wrote:
>>
>> I'll cherry pick that commit into the 4.13 branch to get this resolved.
>
> Merging commit 8e8320c9315c might give a better result ...

To be clear, what I meant (and did) was cherry picking 8e8320c9315c
into for-4.13/block.

--
Jens Axboe