From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Thu, 7 Sep 2017 19:12:43 +0000 (-0700)
Subject: Merge branch 'fixes' into misc
X-Git-Tag: v5.15~10481^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2441500a41a9b17ff657626eb81972f62bc8cc5a;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'fixes' into misc
---

2441500a41a9b17ff657626eb81972f62bc8cc5a
diff --cc include/scsi/scsi_cmnd.h
index a9f8f7e,6af198d..3d3f8b3
--- a/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;