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, 6 deletions

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index da9766283bd7..6b85f84c8397 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -3887,9 +3887,7 @@ static int st_probe(struct device *dev)
         if (SDp->type != TYPE_TAPE)
                 return -ENODEV;
         if ((stp = st_incompatible(SDp))) {
-                printk(KERN_INFO
-                       "st: Found incompatible tape at scsi%d, channel %d, id %d, lun %d\n",
-                       SDp->host->host_no, SDp->channel, SDp->id, SDp->lun);
+                sdev_printk(KERN_INFO, SDp, "Found incompatible tape\n");
                 printk(KERN_INFO "st: The suggested driver is %s.\n", stp);
                 return -ENODEV;
         }
@@ -4077,9 +4075,8 @@ static int st_probe(struct device *dev)
         }
         disk->number = devfs_register_tape(SDp->devfs_name);
 
-        printk(KERN_WARNING
-        "Attached scsi tape %s at scsi%d, channel %d, id %d, lun %d\n",
-               tape_name(tpnt), SDp->host->host_no, SDp->channel, SDp->id, SDp->lun);
+        sdev_printk(KERN_WARNING, SDp,
+                    "Attached scsi tape %s", tape_name(tpnt));
         printk(KERN_WARNING "%s: try direct i/o: %s (alignment %d B), max page reachable by HBA %lu\n",
                tape_name(tpnt), tpnt->try_dio ? "yes" : "no",
                queue_dma_alignment(SDp->request_queue) + 1, tpnt->max_pfn);