diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-09-07 12:12:43 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-09-07 12:12:43 -0700 |
| commit | 2441500a41a9b17ff657626eb81972f62bc8cc5a (patch) | |
| tree | a73d114149de8daa1da3713d4048930ba7421384 /include | |
| parent | a45a1f3614182267803baadba657b59e2ddc0545 (diff) | |
| parent | e6f77540c067b48dee10f1e33678415bfcc89017 (diff) | |
| download | linux-2441500a41a9b17ff657626eb81972f62bc8cc5a.tar.gz linux-2441500a41a9b17ff657626eb81972f62bc8cc5a.tar.bz2 linux-2441500a41a9b17ff657626eb81972f62bc8cc5a.zip | |
Merge branch 'fixes' into misc
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpuhotplug.h | 2 | ||||
| -rw-r--r-- | include/scsi/scsi_cmnd.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index b56573bf440d..82b30e638430 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -39,8 +39,6 @@ enum cpuhp_state { CPUHP_PCI_XGENE_DEAD, CPUHP_IOMMU_INTEL_DEAD, CPUHP_LUSTRE_CFS_DEAD, - CPUHP_SCSI_BNX2FC_DEAD, - CPUHP_SCSI_BNX2I_DEAD, CPUHP_WORKQUEUE_PREP, CPUHP_POWER_NUMA_PREPARE, CPUHP_HRTIMERS_PREPARE, diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h index a9f8f7e79d83..3d3f8b342e05 100644 --- a/include/scsi/scsi_cmnd.h +++ b/include/scsi/scsi_cmnd.h @@ -57,6 +57,7 @@ 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) |