From: Huacai Chen <chenhuacai@loongson.cn>
Date: Tue, 17 Sep 2024 14:20:12 +0000 (+0800)
Subject: Merge tag 'irq-core-2024-09-16' into loongarch-next
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/987cbafe628ae67fe6cad0ce1dcc41743147ef3e

Merge tag 'irq-core-2024-09-16' into loongarch-next

LoongArch architecture changes for 6.12 depend on the irq core
changes about AVEC irqchip to avoid confliction, so merge them
to create a base.
---

987cbafe628ae67fe6cad0ce1dcc41743147ef3e
diff --cc include/linux/cpuhotplug.h
index 9316c39260e0,55a726d317d4..f39186738d81
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@@ -144,10 -145,10 +144,11 @@@ enum cpuhp_state 
  	CPUHP_AP_IRQ_ARMADA_XP_STARTING,
  	CPUHP_AP_IRQ_BCM2836_STARTING,
  	CPUHP_AP_IRQ_MIPS_GIC_STARTING,
- 	CPUHP_AP_IRQ_LOONGARCH_STARTING,
+ 	CPUHP_AP_IRQ_EIOINTC_STARTING,
+ 	CPUHP_AP_IRQ_AVECINTC_STARTING,
  	CPUHP_AP_IRQ_SIFIVE_PLIC_STARTING,
  	CPUHP_AP_IRQ_RISCV_IMSIC_STARTING,
 +	CPUHP_AP_IRQ_RISCV_SBI_IPI_STARTING,
  	CPUHP_AP_ARM_MVEBU_COHERENCY,
  	CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING,
  	CPUHP_AP_PERF_X86_STARTING,