Merge branch 'fixes' into misc

diff --cc drivers/scsi/aacraid/aachba.c
Simple merge

diff --cc drivers/scsi/aacraid/aacraid.h
Simple merge

diff --cc drivers/scsi/csiostor/csio_init.c
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_sas_base.c
Simple merge

diff --cc drivers/scsi/qedf/qedf.h
Simple merge

diff --cc drivers/scsi/qedf/qedf_main.c
Simple merge

diff --cc drivers/scsi/qedi/qedi_main.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_attr.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_tmpl.c
Simple merge

diff --cc drivers/scsi/scsi.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/scsi/ses.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc include/scsi/scsi_cmnd.h
index a9f8f7e79d8360d0ace68117ae704826d00c26bd,6af198d8120b098f31d674f15584ec7114832743..3d3f8b342e05d14e76d912251a36d6111ab4da88
--- 1/include/scsi/scsi_cmnd.h
--- 2/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@@ -57,9 -57,7 +57,10 @@@ struct scsi_pointer 
  /* for scmd->flags */
  #define SCMD_TAGGED           (1 << 0)
  #define SCMD_UNCHECKED_ISA_DMA        (1 << 1)
+ #define SCMD_ZONE_WRITE_LOCK  (1 << 2)
 +#define SCMD_INITIALIZED      (1 << 3)
 +/* flags preserved across unprep / reprep */
 +#define SCMD_PRESERVED_FLAGS  (SCMD_UNCHECKED_ISA_DMA | SCMD_INITIALIZED)
  
  struct scsi_cmnd {
        struct scsi_request req;