linux-next: build failure after merge of the target-updates tree

public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Nicholas A. Bellinger" <nab@linux-iscsi•org>,
	James Bottomley <James.Bottomley@HansenPartnership•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Christoph Hellwig <hch@lst•de>,
	Bart Van Assche <bart.vanassche@sandisk•com>
Subject: linux-next: build failure after merge of the target-updates tree
Date: Wed, 3 Jun 2015 18:16:07 +1000	[thread overview]
Message-ID: <20150603181607.70cef830@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 3892 bytes --]

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 <sfr@canb•auug.org.au>
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 <sfr@canb•auug.org.au>
---
 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 <linux/spinlock.h>
 #include <linux/export.h>
 
+#include <scsi/scsi_proto.h>
+
 #include <target/target_core_base.h>
 #include <target/target_core_fabric.h>
 
-- 
2.1.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

next             reply	other threads:[~2015-06-03  8:16 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-03  8:16 Stephen Rothwell [this message]
2015-06-03 20:00 ` linux-next: build failure after merge of the target-updates tree James Bottomley
2015-06-03 22:12   ` Nicholas A. Bellinger
2015-06-03 22:33     ` James Bottomley
2015-06-03 22:46       ` Nicholas A. Bellinger
  -- strict thread matches above, loose matches on Subject: below --
2015-10-07  3:49 Stephen Rothwell
2015-10-07 12:27 ` Alexander Shishkin
2015-10-07 20:22   ` Stephen Rothwell
2015-05-12  4:54 Stephen Rothwell
2014-10-03  5:46 Stephen Rothwell
2014-10-03  8:10 ` Nicholas A. Bellinger
2014-05-23  9:11 Stephen Rothwell
2014-05-23 17:38 ` Nicholas A. Bellinger
2014-01-20  5:25 Stephen Rothwell
2012-09-17  3:41 Stephen Rothwell
2012-09-18  0:57 ` Nicholas A. Bellinger
2012-02-10  0:50 Stephen Rothwell
2012-02-10  1:33 ` Nicholas A. Bellinger

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:b05578b5b4a dfblob:cb6497ce4b6 )
 OR (
bs:"target: explicitly include scsi_proto.h in target_core_fabric_lib.c" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150603181607.70cef830@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=James.Bottomley@HansenPartnership$(echo .)com \
    --cc=bart.vanassche@sandisk$(echo .)com \
    --cc=hch@lst$(echo .)de \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=nab@linux-iscsi$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox