* Jason Cooper <jason@xxxxxxxxxxxxxx> [150313 10:25]: > Hey Tony, > > On Fri, Mar 13, 2015 at 08:40:39AM -0700, Tony Lindgren wrote: > > * Marc Zyngier <marc.zyngier@xxxxxxx> [150311 08:44]: > > > This series is extracted from [4], which is trying to remove all > > > traces of gic_arch_extn from the tree. As some maintainers are more > > > responsive than others (understatement of the year...), I've decided > > > to split it per sub-arch, and get it moving, at least partially. > > > > > > This series addresses OMAP{4,5} by converting the WUGEN to stacked > > > domains. The DRA7 crossbar gets the same treatment. > > ... > > > > > > Documentation/devicetree/bindings/arm/gic.txt | 6 - > > > .../devicetree/bindings/arm/omap/crossbar.txt | 18 +- > > > .../interrupt-controller/ti,omap4-wugen-mpu | 33 ++++ > > > arch/arm/boot/dts/am4372.dtsi | 11 +- > > > arch/arm/boot/dts/am437x-gp-evm.dts | 1 - > > > arch/arm/boot/dts/am437x-sk-evm.dts | 1 - > > > arch/arm/boot/dts/am43x-epos-evm.dts | 1 - > > > arch/arm/boot/dts/am57xx-beagle-x15.dts | 3 +- > > > arch/arm/boot/dts/dra7-evm.dts | 2 +- > > > arch/arm/boot/dts/dra7.dtsi | 43 +++-- > > > arch/arm/boot/dts/dra72-evm.dts | 1 - > > > arch/arm/boot/dts/dra72x.dtsi | 3 +- > > > arch/arm/boot/dts/dra74x.dtsi | 5 +- > > > arch/arm/boot/dts/omap4-duovero.dtsi | 2 - > > > arch/arm/boot/dts/omap4-panda-common.dtsi | 8 +- > > > arch/arm/boot/dts/omap4-sdp.dts | 8 +- > > > arch/arm/boot/dts/omap4-var-som-om44.dtsi | 2 - > > > arch/arm/boot/dts/omap4.dtsi | 18 +- > > > arch/arm/boot/dts/omap5-cm-t54.dts | 1 - > > > arch/arm/boot/dts/omap5-uevm.dts | 2 - > > > arch/arm/boot/dts/omap5.dtsi | 26 ++- > > > arch/arm/mach-omap2/omap-wakeupgen.c | 128 ++++++++++--- > > > arch/arm/mach-omap2/omap-wakeupgen.h | 1 - > > > arch/arm/mach-omap2/omap4-common.c | 27 +-- > > > drivers/irqchip/irq-crossbar.c | 210 ++++++++++++--------- > > > drivers/irqchip/irq-gic.c | 59 +----- > > > include/linux/irq.h | 1 + > > > include/linux/irqchip/arm-gic.h | 6 - > > > include/linux/irqchip/irq-crossbar.h | 11 -- > > > kernel/irq/chip.c | 16 ++ > > > 30 files changed, 376 insertions(+), 278 deletions(-) > > > create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,omap4-wugen-mpu > > > delete mode 100644 include/linux/irqchip/irq-crossbar.h > > > > For merging this, how about Marc sets up an immutable branch against > > v4.0-rc1 that both Jason and I can merge it in? Then Jason can > > send the pull request I can sort out the merge conflict issues. > > If you don't mind, I'll create the branch. I tend to fixup some nitpicks when > I apply patches for irqchip. If there are any nits you'd like me to fix while > I'm applying, just let me know. That works for me thanks as long as it works for Marc. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html