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

2015-03-18 Thread Jason Cooper
On Mon, Mar 16, 2015 at 11:04:58AM +0100, Thierry Reding wrote: > On Mon, Mar 16, 2015 at 02:55:08PM +1100, Stephen Rothwell wrote: > > * PGP Signed by an unknown key > > > > Hi Jason, > > > > Today's linux-next merge of the irqchip tree got a conflict in > > arch/arm/mach-tegra/irq.c between

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

2015-03-18 Thread Jason Cooper
On Mon, Mar 16, 2015 at 11:04:58AM +0100, Thierry Reding wrote: On Mon, Mar 16, 2015 at 02:55:08PM +1100, Stephen Rothwell wrote: * PGP Signed by an unknown key Hi Jason, Today's linux-next merge of the irqchip tree got a conflict in arch/arm/mach-tegra/irq.c between commit

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

2015-03-16 Thread Thierry Reding
On Mon, Mar 16, 2015 at 02:55:08PM +1100, Stephen Rothwell wrote: > * PGP Signed by an unknown key > > Hi Jason, > > Today's linux-next merge of the irqchip tree got a conflict in > arch/arm/mach-tegra/irq.c between commit 0a63e1e0617f ("ARM: tegra: Fix > big-endian issue with IRQ code") from

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

2015-03-16 Thread Marc Zyngier
On 16/03/15 03:55, Stephen Rothwell wrote: > Hi Jason, > > Today's linux-next merge of the irqchip tree got a conflict in > arch/arm/mach-tegra/irq.c between commit 0a63e1e0617f ("ARM: tegra: Fix > big-endian issue with IRQ code") from the tegra tree and commit > 1a703bffd82e ("ARM: tegra: remove

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

2015-03-16 Thread Thierry Reding
On Mon, Mar 16, 2015 at 02:55:08PM +1100, Stephen Rothwell wrote: * PGP Signed by an unknown key Hi Jason, Today's linux-next merge of the irqchip tree got a conflict in arch/arm/mach-tegra/irq.c between commit 0a63e1e0617f (ARM: tegra: Fix big-endian issue with IRQ code) from the tegra

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

2015-03-16 Thread Marc Zyngier
On 16/03/15 03:55, Stephen Rothwell wrote: Hi Jason, Today's linux-next merge of the irqchip tree got a conflict in arch/arm/mach-tegra/irq.c between commit 0a63e1e0617f (ARM: tegra: Fix big-endian issue with IRQ code) from the tegra tree and commit 1a703bffd82e (ARM: tegra: remove old LIC

linux-next: manual merge of the irqchip tree with the tegra tree

2015-03-15 Thread Stephen Rothwell
Hi Jason, Today's linux-next merge of the irqchip tree got a conflict in arch/arm/mach-tegra/irq.c between commit 0a63e1e0617f ("ARM: tegra: Fix big-endian issue with IRQ code") from the tegra tree and commit 1a703bffd82e ("ARM: tegra: remove old LIC support") from the irqchip tree. I fixed it

linux-next: manual merge of the irqchip tree with the tegra tree

2015-03-15 Thread Stephen Rothwell
Hi Jason, Today's linux-next merge of the irqchip tree got a conflict in arch/arm/mach-tegra/irq.c between commit 0a63e1e0617f (ARM: tegra: Fix big-endian issue with IRQ code) from the tegra tree and commit 1a703bffd82e (ARM: tegra: remove old LIC support) from the irqchip tree. I fixed it up