]> Git Repo - linux.git/commitdiff
Merge tag 'irq-core-2024-09-16' into loongarch-next
authorHuacai Chen <[email protected]>
Tue, 17 Sep 2024 14:20:12 +0000 (22:20 +0800)
committerHuacai Chen <[email protected]>
Tue, 17 Sep 2024 14:20:12 +0000 (22:20 +0800)
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.

1  2 
arch/loongarch/kernel/irq.c
drivers/irqchip/irq-gic-v3.c
drivers/irqchip/irq-loongarch-cpu.c
drivers/irqchip/irq-mbigen.c
include/linux/cpuhotplug.h
net/core/dev.c

Simple merge
Simple merge
Simple merge
Simple merge
index 9316c39260e0e43d92ef0cbbf9f44dc9c9d18bee,55a726d317d451b7d36a89f7537a014219dbad41..f39186738d81b3024805e62b39aeac1f34728545
@@@ -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,
diff --cc net/core/dev.c
Simple merge
This page took 0.083517 seconds and 4 git commands to generate.