Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755845AbcLADCs (ORCPT ); Wed, 30 Nov 2016 22:02:48 -0500 Received: from ozlabs.org ([103.22.144.67]:45011 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755093AbcLADCq (ORCPT ); Wed, 30 Nov 2016 22:02:46 -0500 Date: Thu, 1 Dec 2016 14:02:43 +1100 From: Stephen Rothwell To: Jens Axboe Cc: David Chinner , xfs@oss.sgi.com, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig Subject: Re: linux-next: build failure after merge of the block tree Message-ID: <20161201140243.2554a006@canb.auug.org.au> In-Reply-To: References: <20161201135517.273c9a4d@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: 594 Lines: 27 Hi Jens, On Wed, 30 Nov 2016 20:00:36 -0700 Jens Axboe wrote: > > On 11/30/2016 07:55 PM, Stephen Rothwell wrote: > > > > I love APIs changing :-( > > It's a necessary evil... Yeah > This could have been avoided with the XFS tree pulling in the block > changes, but that obviously has other implications. Something to watch > for when the XFS tree is sent in for the merge window, however. Indeed. Or the block tree, which ever comes last. > > I have applied the following merge fix patch for today. > > The fix is correct. Thanks. -- Cheers, Stephen Rothwell