Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754181AbdFWD4X (ORCPT ); Thu, 22 Jun 2017 23:56:23 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:34926 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752145AbdFWD4W (ORCPT ); Thu, 22 Jun 2017 23:56:22 -0400 Subject: Re: linux-next: manual merge of the block tree with Linus' tree To: Stephen Rothwell Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Christoph Hellwig References: <20170623130632.03bc60af@canb.auug.org.au> <20170623132433.5aff6b19@canb.auug.org.au> <612521b1-f272-3e4a-e295-c3bac3e54f25@kernel.dk> <20170623133314.3df3dbbe@canb.auug.org.au> From: Jens Axboe Message-ID: <53dcc297-d279-6211-7767-816776f2c569@kernel.dk> Date: Thu, 22 Jun 2017 21:56:16 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <20170623133314.3df3dbbe@canb.auug.org.au> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 756 Lines: 26 On 06/22/2017 09:33 PM, Stephen Rothwell wrote: > Hi Jens, > > On Thu, 22 Jun 2017 21:27:04 -0600 Jens Axboe wrote: >> >> On 06/22/2017 09:24 PM, Stephen Rothwell wrote: >>> Hi Jens, >>> >>> On Thu, 22 Jun 2017 21:09:22 -0600 Jens Axboe 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