Merge by Hand

Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index f6be2c1c3942..09bc81557b6e 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -1389,10 +1389,7 @@ EXPORT_SYMBOL(scsi_print_msg);
 void scsi_print_command(struct scsi_cmnd *cmd)
 {
         /* Assume appended output (i.e. not at start of line) */
-        printk("scsi%d : destination target %d, lun %d\n", 
-                cmd->device->host->host_no, 
-                cmd->device->id, 
-                cmd->device->lun);
+        sdev_printk("", cmd->device, "\n");
         printk(KERN_INFO "        command: ");
         scsi_print_cdb(cmd->cmnd, cmd->cmd_len, 0);
 }