Merge by hand (conflicts in scsi_lib.c)

This merge is pretty extensive.  The conflict is over the new
req->retries parameter, so I had to change the prototype to
scsi_setup_blk_pc_cmnd() and the usage in sd, sr and st.

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

1 files changed, 1 insertions, 9 deletions

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index ce0d88bbaa06..79d8a914f9d0 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2498,17 +2498,9 @@ typedef struct scsi_qla_host {
  */
 #define LOOP_TRANSITION(ha) \
         (test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \
-         test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags))
-
-#define LOOP_NOT_READY(ha) \
-        ((test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \
-          test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags) || \
-          test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || \
-          test_bit(LOOP_RESYNC_ACTIVE, &ha->dpc_flags)) || \
+         test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || \
          atomic_read(&ha->loop_state) == LOOP_DOWN)
 
-#define LOOP_RDY(ha)    (!LOOP_NOT_READY(ha))
-
 #define TGT_Q(ha, t) (ha->otgt[t])
 
 #define to_qla_host(x)          ((scsi_qla_host_t *) (x)->hostdata)