Merge branch 'fixes' into misc
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Thu, 7 Sep 2017 19:12:43 +0000 (12:12 -0700)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Thu, 7 Sep 2017 19:12:43 +0000 (12:12 -0700)
14 files changed:
1  2 
drivers/scsi/aacraid/aachba.c
drivers/scsi/aacraid/aacraid.h
drivers/scsi/csiostor/csio_init.c
drivers/scsi/megaraid/megaraid_sas_base.c
drivers/scsi/qedf/qedf.h
drivers/scsi/qedf/qedf_main.c
drivers/scsi/qedi/qedi_main.c
drivers/scsi/qla2xxx/qla_attr.c
drivers/scsi/qla2xxx/qla_tmpl.c
drivers/scsi/scsi.c
drivers/scsi/sd.c
drivers/scsi/ses.c
drivers/scsi/sg.c
include/scsi/scsi_cmnd.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index a9f8f7e79d8360d0ace68117ae704826d00c26bd,6af198d8120b098f31d674f15584ec7114832743..3d3f8b342e05d14e76d912251a36d6111ab4da88
@@@ -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;