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, 3 insertions, 3 deletions

diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 172839fce0eb..1cf11c3322fb 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -5819,9 +5819,9 @@ static int osst_probe(struct device *dev)
         }
         drive->number = devfs_register_tape(SDp->devfs_name);
 
-        printk(KERN_INFO
-                "osst :I: Attached OnStream %.5s tape at scsi%d, channel %d, id %d, lun %d as %s\n",
-                SDp->model, SDp->host->host_no, SDp->channel, SDp->id, SDp->lun, tape_name(tpnt));
+        sdev_printk(KERN_INFO, SDp,
+                "osst :I: Attached OnStream %.5s tape as %s\n",
+                SDp->model, tape_name(tpnt));
 
         return 0;