From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757283AbbEVMts (ORCPT <rfc822;w@1wt.eu>);
	Fri, 22 May 2015 08:49:48 -0400
Received: from mx1.redhat.com ([209.132.183.28]:58804 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1756375AbbEVMtp (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Fri, 22 May 2015 08:49:45 -0400
Date: Fri, 22 May 2015 08:49:39 -0400
From: Mike Snitzer <snitzer@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alasdair G Kergon <agk@redhat.com>, Jens Axboe <axboe@kernel.dk>,
        linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the device-mapper tree
Message-ID: <20150522124938.GA7471@redhat.com>
References: <20150522132721.43c296cb@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150522132721.43c296cb@canb.auug.org.au>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, May 21 2015 at 11:27pm -0400,
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> After merging the device-mapper tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> block/bio.c:310:20: error: redefinition of 'bio_inc_remaining'
>  static inline void bio_inc_remaining(struct bio *bio)
>                     ^
> In file included from block/bio.c:20:0:
> include/linux/bio.h:664:20: note: previous definition of 'bio_inc_remaining' was here
>  static inline void bio_inc_remaining(struct bio *bio)
>                     ^
> 
> Caused by commit d61b82161c5a ("block: remove management of
> bi_remaining when restoring original bi_end_io").
> 
> OK, this is a bad automatic merge caused by the fact that the block
> tree and the device-mapper tree both contain the same set fo patches as
> different commits.
> 
> Commit c4cf5261f8bf from the block tree is the same as commit
> 8395711c4f90 from the device-mapper tree and both add
> bio_inc_remaining() to include/linux/bio.h.  The above commit in the
> device-mapper tree removes it from there, but the merge decided to keep
> it.
> 
> That shared patch above is part of a series of 14 patches that are
> identical patches but different commits and are causing quite a few
> conflicts.  It looks like those patches were rebased onto v4.10rc3 as
> the base for the device-mapper tree.  A better idea would have been to
> start with v4.1rc3 (if that is necessary) and merge commit 5b3f341f098d
> ("blk-mq: make plug work for mutiple disks and queues") from the block
> tree - assuming that Jens will guarantee not to rebase that part of his
> tree.
> 
> Please clean this mess up.

Will do.
 
> I have used the version of the device-mapper tree from next-20150521
> for today.

Thanks,
Mike