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

Bring in the block hotplug states for consistency.

diff --cc include/linux/cpuhotplug.h
index dea6696c673a76356f5d13d8d57c5b082e710fd3,2ac07d01bdb532acd1005f436341a825d57fdfe2..510205edcdd63d9915c60003300de163e2639f28
--- 1/include/linux/cpuhotplug.h
--- 2/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@@ -14,38 -14,17 +14,40 @@@ enum cpuhp_state 
        CPUHP_PERF_SUPERH,
        CPUHP_X86_HPET_DEAD,
        CPUHP_X86_APB_DEAD,
 +      CPUHP_VIRT_NET_DEAD,
 +      CPUHP_SLUB_DEAD,
 +      CPUHP_MM_WRITEBACK_DEAD,
 +      CPUHP_SOFTIRQ_DEAD,
 +      CPUHP_NET_MVNETA_DEAD,
 +      CPUHP_CPUIDLE_DEAD,
 +      CPUHP_ARM64_FPSIMD_DEAD,
 +      CPUHP_ARM_OMAP_WAKE_DEAD,
 +      CPUHP_IRQ_POLL_DEAD,
 +      CPUHP_BLOCK_SOFTIRQ_DEAD,
 +      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,
        CPUHP_PROFILE_PREPARE,
        CPUHP_X2APIC_PREPARE,
        CPUHP_SMPCFD_PREPARE,
 +      CPUHP_RELAY_PREPARE,
 +      CPUHP_SLAB_PREPARE,
 +      CPUHP_MD_RAID5_PREPARE,
        CPUHP_RCUTREE_PREP,
 +      CPUHP_CPUIDLE_COUPLED_PREPARE,
 +      CPUHP_POWERPC_PMAC_PREPARE,
 +      CPUHP_POWERPC_MMU_CTX_PREPARE,
        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,
        CPUHP_BRINGUP_CPU,
        CPUHP_AP_IDLE_DEAD,
        CPUHP_AP_OFFLINE,