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

2021-02-26 Thread Paul Kocialkowski
Hi, On Thu 18 Feb 21, 15:48, Stephen Rothwell wrote: > Hi all, > > On Mon, 15 Feb 2021 09:11:24 +1100 Stephen Rothwell > wrote: > > > > On Mon, 1 Feb 2021 14:42:59 +1100 Stephen Rothwell > > wrote: > > > > > > Today's linux-next merge of the irqchip tree got a conflict in: > > > > > > >

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

2021-02-17 Thread Stephen Rothwell
Hi all, On Mon, 15 Feb 2021 09:11:24 +1100 Stephen Rothwell wrote: > > On Mon, 1 Feb 2021 14:42:59 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the irqchip tree got a conflict in: > > > > > >

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

2021-02-14 Thread Stephen Rothwell
Hi all, On Mon, 1 Feb 2021 14:42:59 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the irqchip tree got a conflict in: > > > Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml > > between commit: > > 752b0aac99c7 ("dt-bindings: irq: