Merge branch 'smp/for-block' into smp/hotplug

Bring in the block hotplug states for consistency.
cluon · Sep 21, 2016 · 0bf71e4 · 0bf71e4
2 parents 5372e05 + e2a738f
commit 0bf71e4
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
@@ -27,6 +27,7 @@ enum cpuhp_state {
 	CPUHP_VIRT_SCSI_DEAD,
 	CPUHP_ACPI_CPUDRV_DEAD,
 	CPUHP_S390_PFAULT_DEAD,
+	CPUHP_BLK_MQ_DEAD,
 	CPUHP_WORKQUEUE_PREP,
 	CPUHP_POWER_NUMA_PREPARE,
 	CPUHP_HRTIMERS_PREPARE,
@@ -43,6 +44,7 @@ enum cpuhp_state {
 	CPUHP_NOTIFY_PREPARE,
 	CPUHP_ARM_SHMOBILE_SCU_PREPARE,
 	CPUHP_SH_SH3X_PREPARE,
+	CPUHP_BLK_MQ_PREPARE,
 	CPUHP_TIMERS_DEAD,
 	CPUHP_NOTF_ERR_INJ_PREPARE,
 	CPUHP_MIPS_SOC_PREPARE,