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, 10 insertions, 2 deletions

diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
index 9589c67de535..91322aff241d 100644
--- a/drivers/scsi/tmscsim.c
+++ b/drivers/scsi/tmscsim.c
@@ -988,7 +988,15 @@ din_1:
 
             if( residual )
             {
+                static int feedback_requested;
                 bval = DC390_read8 (ScsiFifo);      /* get one residual byte */
+
+                if (!feedback_requested) {
+                        feedback_requested = 1;
+                        printk(KERN_WARNING "%s: Please, contact <linux-scsi@vger.kernel.org> "
+                               "to help improve support for your system.\n", __FILE__);
+                }
+
                 ptr = (u8 *) bus_to_virt( pSRB->SGBusAddr );
                 *ptr = bval;
                 pSRB->SGBusAddr++; xferCnt++;
@@ -2077,8 +2085,8 @@ static int DC390_abort(struct scsi_cmnd *cmd)
         struct dc390_acb *pACB = (struct dc390_acb*) cmd->device->host->hostdata;
         struct dc390_dcb *pDCB = (struct dc390_dcb*) cmd->device->hostdata;
 
-        printk("DC390: Abort command (pid %li, Device %02i-%02i)\n",
-               cmd->pid, cmd->device->id, cmd->device->lun);
+        scmd_printk(KERN_WARNING, cmd,
+                "DC390: Abort command (pid %li)\n", cmd->pid);
 
         /* abort() is too stupid for already sent commands at the moment. 
          * If it's called we are in trouble anyway, so let's dump some info