lkml.org 
[lkml]   [2017]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the block tree with Linus' tree
From
Date
On 06/22/2017 09:33 PM, Stephen Rothwell wrote:
> Hi Jens,
>
> On Thu, 22 Jun 2017 21:27:04 -0600 Jens Axboe <axboe@kernel.dk> wrote:
>>
>> On 06/22/2017 09:24 PM, Stephen Rothwell wrote:
>>> Hi Jens,
>>>
>>> On Thu, 22 Jun 2017 21:09:22 -0600 Jens Axboe <axboe@kernel.dk> wrote:
>>>>
>>>> I'll cherry pick that commit into the 4.13 branch to get this resolved.
>>>
>>> Merging commit 8e8320c9315c might give a better result ...
>>
>> I don't want to pull the whole thing in, just that offending commit.
>
> Your tree is already based on v4.12-rc5 so you are not really pulling
> much in at all:
>
> $ git rev-list --count --no-merges 8e8320c9315c ^block/for-next
> 14

Yeah good point, I guess not a lot has happened since -rc5.

--
Jens Axboe

\
 
 \ /
  Last update: 2017-06-23 05:56    [W:0.063 / U:0.060 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site