linux-next: manual merge of the irqchip tree with the arm-soc tree

2021-04-08 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the irqchip tree got conflicts in: drivers/irqchip/Kconfig drivers/irqchip/Makefile between commit: 76cde2639411 ("irqchip/apple-aic: Add support for the Apple Interrupt Controller") from the arm-soc tree and commits: fead4dd49663 ("irqchip: Add dr

Re: linux-next: manual merge of the irqchip tree with the arm-soc tree

2018-05-29 Thread Olof Johansson
Hi, On Tue, May 29, 2018 at 5:20 AM, Ludovic BARRE wrote: > > > On 05/29/2018 10:55 AM, Alexandre Torgue wrote: >> >> >> >> On 05/29/2018 10:39 AM, Marc Zyngier wrote: >>> >>> On 29/05/18 09:16, Alexandre Torgue wrote: Hi Marc On 05/29/2018 09:47 AM, Marc Zyngier wrote: >

Re: linux-next: manual merge of the irqchip tree with the arm-soc tree

2018-05-29 Thread Ludovic BARRE
On 05/29/2018 10:55 AM, Alexandre Torgue wrote: On 05/29/2018 10:39 AM, Marc Zyngier wrote: On 29/05/18 09:16, Alexandre Torgue wrote: Hi Marc On 05/29/2018 09:47 AM, Marc Zyngier wrote: On 29/05/18 08:41, Alexandre Torgue wrote: Hi Stephen On 05/29/2018 07:52 AM, Stephen Rothwell wrot

Re: linux-next: manual merge of the irqchip tree with the arm-soc tree

2018-05-29 Thread Alexandre Torgue
On 05/29/2018 10:39 AM, Marc Zyngier wrote: On 29/05/18 09:16, Alexandre Torgue wrote: Hi Marc On 05/29/2018 09:47 AM, Marc Zyngier wrote: On 29/05/18 08:41, Alexandre Torgue wrote: Hi Stephen On 05/29/2018 07:52 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the irqchi

Re: linux-next: manual merge of the irqchip tree with the arm-soc tree

2018-05-29 Thread Marc Zyngier
On 29/05/18 09:16, Alexandre Torgue wrote: > Hi Marc > > On 05/29/2018 09:47 AM, Marc Zyngier wrote: >> On 29/05/18 08:41, Alexandre Torgue wrote: >>> Hi Stephen >>> >>> On 05/29/2018 07:52 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the irqchip tree got a confli

Re: linux-next: manual merge of the irqchip tree with the arm-soc tree

2018-05-29 Thread Alexandre Torgue
Hi Marc On 05/29/2018 09:47 AM, Marc Zyngier wrote: On 29/05/18 08:41, Alexandre Torgue wrote: Hi Stephen On 05/29/2018 07:52 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the irqchip tree got a conflict in: arch/arm/boot/dts/stm32mp157c.dtsi between commit: 3c00

Re: linux-next: manual merge of the irqchip tree with the arm-soc tree

2018-05-29 Thread Marc Zyngier
On 29/05/18 08:41, Alexandre Torgue wrote: > Hi Stephen > > On 05/29/2018 07:52 AM, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the irqchip tree got a conflict in: >> >>arch/arm/boot/dts/stm32mp157c.dtsi >> >> between commit: >> >>3c00436fdb20 ("ARM: dts: stm32: ad

Re: linux-next: manual merge of the irqchip tree with the arm-soc tree

2018-05-29 Thread Alexandre Torgue
Hi Stephen On 05/29/2018 07:52 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the irqchip tree got a conflict in: arch/arm/boot/dts/stm32mp157c.dtsi between commit: 3c00436fdb20 ("ARM: dts: stm32: add USBPHYC support to stm32mp157c") from the arm-soc tree and commit:

linux-next: manual merge of the irqchip tree with the arm-soc tree

2018-05-28 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the irqchip tree got a conflict in: arch/arm/boot/dts/stm32mp157c.dtsi between commit: 3c00436fdb20 ("ARM: dts: stm32: add USBPHYC support to stm32mp157c") from the arm-soc tree and commit: 5f0e9d2557d7 ("ARM: dts: stm32: Add exti support for stm32mp1

linux-next: manual merge of the irqchip tree with the arm-soc tree

2014-07-28 Thread Stephen Rothwell
Hi Jason, Today's linux-next merge of the irqchip tree got a conflict in Documentation/devicetree/bindings/arm/gic.txt between commit f80b71397d09 ("ARM: brcmstb: gic: add compatible string for Broadcom Brahma15") from the arm-soc tree and commit 3e44358c12cc ("") from the irqchip tree. I fixed i