]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge 'irq/loongarch', 'pci/ctrl/loongson' and 'pci/header-cleanup-immutable'
authorHuacai Chen <chenhuacai@loongson.cn>
Thu, 11 Aug 2022 13:06:14 +0000 (21:06 +0800)
committerHuacai Chen <chenhuacai@loongson.cn>
Thu, 11 Aug 2022 13:06:14 +0000 (21:06 +0800)
LoongArch architecture changes for 5.20 depend on the irqchip and pci
changes to work, so merge them to create a base.

1  2  3  4 
arch/arm/include/asm/dma.h
arch/loongarch/Kconfig
drivers/acpi/bus.c
drivers/irqchip/Kconfig
drivers/irqchip/irq-gic-v3.c
include/linux/acpi.h
include/linux/cpuhotplug.h

Simple merge
Simple merge
Simple merge
index bbb11cb8b0f73a22cf167fe2e473639141349b39,f53164ccdc9f8bd1c94fc03dfb955e53d9efe488,4ab1038b548286d69a239ce04b9a78ab0b2507f7,4ab1038b548286d69a239ce04b9a78ab0b2507f7..a9cd92983631171dbc577e2a9f6297c2f236664a
@@@@@ -298,7 -298,7 -298,7 -298,7 +298,7 @@@@@ config XTENSA_M
    
    config XILINX_INTC
        bool "Xilinx Interrupt Controller IP"
 -      depends on OF
  --    depends on MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP
 +++    depends on OF_ADDRESS
        select IRQ_DOMAIN
        help
          Support for the Xilinx Interrupt Controller IP core.
Simple merge
Simple merge
Simple merge