This patch only reseves two CPU hotplug ids for block/mq to avoid clashes during merge.
Cc: Jens Axboe <ax...@kernel.dk> Signed-off-by: Sebastian Andrzej Siewior <bige...@linutronix.de> --- include/linux/cpuhotplug.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index eb0298440206..fceebbe77dd5 100644 --- 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_BLKMQ_DEAD, CPUHP_WORKQUEUE_PREP, CPUHP_POWER_NUMA_PREPARE, CPUHP_HRTIMERS_PREPARE, @@ -47,6 +48,7 @@ enum cpuhp_state { CPUHP_NOTF_ERR_INJ_PREPARE, CPUHP_MIPS_CAVIUM_PREPARE, CPUHP_MIPS_LOONGSON_PREPARE, + CPUHP_BLK_MQ_PREPARE, CPUHP_TIMERS_DEAD, CPUHP_BRINGUP_CPU, CPUHP_AP_IDLE_DEAD, -- 2.9.3