From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 21 Sep 2016 07:39:00 +0000 (+0200)
Subject: Merge branch 'smp/for-block' into smp/hotplug
X-Git-Tag: v5.15~12783^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0bf71e4d02ffec8ab9a6adecca61d3eed74fc99d;p=platform%2Fkernel%2Flinux-starfive.git

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

Bring in the block hotplug states for consistency.
---

0bf71e4d02ffec8ab9a6adecca61d3eed74fc99d
diff --cc include/linux/cpuhotplug.h
index dea6696,2ac07d0..510205e
--- a/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,