Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754180AbdFWDYh (ORCPT ); Thu, 22 Jun 2017 23:24:37 -0400 Received: from ozlabs.org ([103.22.144.67]:44379 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753925AbdFWDYf (ORCPT ); Thu, 22 Jun 2017 23:24:35 -0400 Date: Fri, 23 Jun 2017 13:24:33 +1000 From: Stephen Rothwell To: Jens Axboe Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Christoph Hellwig Subject: Re: linux-next: manual merge of the block tree with Linus' tree Message-ID: <20170623132433.5aff6b19@canb.auug.org.au> In-Reply-To: References: <20170623130632.03bc60af@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 247 Lines: 11 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 ... -- Cheers, Stephen Rothwell