Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753910AbbFCWqM (ORCPT <rfc822;w@1wt.eu>);
	Wed, 3 Jun 2015 18:46:12 -0400
Received: from mail.linux-iscsi.org ([67.23.28.174]:41342 "EHLO
	linux-iscsi.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752624AbbFCWqG (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 3 Jun 2015 18:46:06 -0400
Message-ID: <1433371565.18125.10.camel@haakon3.risingtidesystems.com>
Subject: Re: linux-next: build failure after merge of the target-updates tree
From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
To: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
        Bart Van Assche <bart.vanassche@sandisk.com>,
        linux-scsi <linux-scsi@vger.kernel.org>
Date: Wed, 03 Jun 2015 15:46:05 -0700
In-Reply-To: <1433370812.2251.140.camel@HansenPartnership.com>
References: <20150603181607.70cef830@canb.auug.org.au>
	 <1433361639.2251.111.camel@HansenPartnership.com>
	 <1433369576.18125.7.camel@haakon3.risingtidesystems.com>
	 <1433370812.2251.140.camel@HansenPartnership.com>
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.4.4-1 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1686
Lines: 44

On Wed, 2015-06-03 at 15:33 -0700, James Bottomley wrote:
> On Wed, 2015-06-03 at 15:12 -0700, Nicholas A. Bellinger wrote:
> > On Wed, 2015-06-03 at 13:00 -0700, James Bottomley wrote:

<SNIP>

> > > OK, this gives us a cross tree dependency on the SCSI header split
> > > patches.  Nic, if you base your tree off this commit in mine, I'll make
> > > sure to push early in the merge window.
> > > 
> > > commit ba929992522b6d1f866b7021bc50da66f8fdd743
> > > Author: Bart Van Assche <bart.vanassche@sandisk.com>
> > > Date:   Fri May 8 10:11:12 2015 +0200
> > > 
> > >     target: Minimize SCSI header #include directives
> > > 
> > 
> > Rebasing one subsystem's for-next atop another subsystem's for-next is a
> > sure fire way to cause Linus to become irate.
> 
> No, he's fine with it (as long as the trees aren't entangled when
> submitted). We used to do it all the time with the block and SCSI trees;
> it's why the scsi postmerge tree existed.
> 

...

> > But it's not even necessary here anyways, just fold Stephen's patch to
> > add scsi_proto.h to target_core_fabric_configfs.c into the original
> > change, and be done with it.
> 
> I can certainly do that, but other updates to the target tree could
> cause this problem to reoccur in different files.
> 

target_core_fabric_lib.c is the only place where SCSI_PROTOCOL_* is used
and I don't expect this to change before -rc1, so it should be OK to
just fold into the original.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/