Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753282AbbFCWNS (ORCPT ); Wed, 3 Jun 2015 18:13:18 -0400 Received: from mail.linux-iscsi.org ([67.23.28.174]:55362 "EHLO linux-iscsi.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752072AbbFCWNK (ORCPT ); Wed, 3 Jun 2015 18:13:10 -0400 Message-ID: <1433369576.18125.7.camel@haakon3.risingtidesystems.com> Subject: Re: linux-next: build failure after merge of the target-updates tree From: "Nicholas A. Bellinger" To: James Bottomley Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig , Bart Van Assche , linux-scsi Date: Wed, 03 Jun 2015 15:12:56 -0700 In-Reply-To: <1433361639.2251.111.camel@HansenPartnership.com> References: <20150603181607.70cef830@canb.auug.org.au> <1433361639.2251.111.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: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5107 Lines: 110 On Wed, 2015-06-03 at 13:00 -0700, James Bottomley wrote: > On Wed, 2015-06-03 at 18:16 +1000, Stephen Rothwell wrote: > > Hi Nicholas, > > > > After merging the target-updates tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > > > drivers/target/target_core_fabric_lib.c: In function 'target_get_pr_transport_id_len': > > drivers/target/target_core_fabric_lib.c:364:7: error: 'SCSI_PROTOCOL_FCP' undeclared (first use in this function) > > case SCSI_PROTOCOL_FCP: > > ^ > > drivers/target/target_core_fabric_lib.c:364:7: note: each undeclared identifier is reported only once for each function it appears in > > drivers/target/target_core_fabric_lib.c:365:7: error: 'SCSI_PROTOCOL_SBP' undeclared (first use in this function) > > case SCSI_PROTOCOL_SBP: > > ^ > > drivers/target/target_core_fabric_lib.c:366:7: error: 'SCSI_PROTOCOL_SRP' undeclared (first use in this function) > > case SCSI_PROTOCOL_SRP: > > ^ > > drivers/target/target_core_fabric_lib.c:367:7: error: 'SCSI_PROTOCOL_SAS' undeclared (first use in this function) > > case SCSI_PROTOCOL_SAS: > > ^ > > drivers/target/target_core_fabric_lib.c:369:7: error: 'SCSI_PROTOCOL_ISCSI' undeclared (first use in this function) > > case SCSI_PROTOCOL_ISCSI: > > ^ > > drivers/target/target_core_fabric_lib.c: In function 'target_get_pr_transport_id': > > drivers/target/target_core_fabric_lib.c:388:7: error: 'SCSI_PROTOCOL_SAS' undeclared (first use in this function) > > case SCSI_PROTOCOL_SAS: > > ^ > > drivers/target/target_core_fabric_lib.c:390:7: error: 'SCSI_PROTOCOL_SBP' undeclared (first use in this function) > > case SCSI_PROTOCOL_SBP: > > ^ > > drivers/target/target_core_fabric_lib.c:392:7: error: 'SCSI_PROTOCOL_SRP' undeclared (first use in this function) > > case SCSI_PROTOCOL_SRP: > > ^ > > drivers/target/target_core_fabric_lib.c:394:7: error: 'SCSI_PROTOCOL_FCP' undeclared (first use in this function) > > case SCSI_PROTOCOL_FCP: > > ^ > > drivers/target/target_core_fabric_lib.c:396:7: error: 'SCSI_PROTOCOL_ISCSI' undeclared (first use in this function) > > case SCSI_PROTOCOL_ISCSI: > > ^ > > drivers/target/target_core_fabric_lib.c: In function 'target_parse_pr_out_transport_id': > > drivers/target/target_core_fabric_lib.c:411:7: error: 'SCSI_PROTOCOL_SAS' undeclared (first use in this function) > > case SCSI_PROTOCOL_SAS: > > ^ > > drivers/target/target_core_fabric_lib.c:418:7: error: 'SCSI_PROTOCOL_SBP' undeclared (first use in this function) > > case SCSI_PROTOCOL_SBP: > > ^ > > drivers/target/target_core_fabric_lib.c:419:7: error: 'SCSI_PROTOCOL_SRP' undeclared (first use in this function) > > case SCSI_PROTOCOL_SRP: > > ^ > > drivers/target/target_core_fabric_lib.c:420:7: error: 'SCSI_PROTOCOL_FCP' undeclared (first use in this function) > > case SCSI_PROTOCOL_FCP: > > ^ > > drivers/target/target_core_fabric_lib.c:423:7: error: 'SCSI_PROTOCOL_ISCSI' undeclared (first use in this function) > > case SCSI_PROTOCOL_ISCSI: > > ^ > > > > Caused by commit 2650d71e244f ("target: move transport ID handling to > > the core") interacting with commit ba929992522b ("target: Minimize SCSI > > header #include directives") from the scsi tree. > > > > I have added this merge fix patch for today: > > > > From: Stephen Rothwell > > Date: Wed, 3 Jun 2015 18:10:46 +1000 > > Subject: [PATCH] target: explicitly include scsi_proto.h in target_core_fabric_lib.c > > > > Signed-off-by: Stephen Rothwell > > --- > > drivers/target/target_core_fabric_lib.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c > > index b05578b5b4a0..cb6497ce4b61 100644 > > --- a/drivers/target/target_core_fabric_lib.c > > +++ b/drivers/target/target_core_fabric_lib.c > > @@ -35,6 +35,8 @@ > > #include > > #include > > > > +#include > > + > > #include > > #include > > 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 > 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. 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. --nab -- 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/