Re: linux-next: manual merge of the irqchip tree with the tegra tree
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 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 (the latter removed the code changed by the former) and > > can carry the fix as necessary (no action is required). > > Hi Jason, > > There's a chance that we might get a couple of other patches for Tegra > that conflict with this series. Would you be able to provide a stable > branch that I can pull into the Tegra tree to resolve those. git://git.infradead.org/users/jcooper/linux.git irqchip/stacked-tegra is now stable. It's based on v4.0-rc1 and only contains this series. thx, Jason. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the irqchip tree with the tegra tree
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 tree and commit > 1a703bffd82e ("ARM: tegra: remove old LIC support") from the irqchip > tree. > > I fixed it up (the latter removed the code changed by the former) and > can carry the fix as necessary (no action is required). Hi Jason, There's a chance that we might get a couple of other patches for Tegra that conflict with this series. Would you be able to provide a stable branch that I can pull into the Tegra tree to resolve those. Another alternative, if you're okay with it, would be for you to ack the series and back it out of your tree and I'll take it through the Tegra tree (I could also provide a stable branch if necessary). Thierry pgpghYBQtAAcJ.pgp Description: PGP signature
Re: linux-next: manual merge of the irqchip tree with the tegra tree
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 support") from the irqchip > tree. > > I fixed it up (the latter removed the code changed by the former) and > can carry the fix as necessary (no action is required). That looks good. Thanks Stephen. M. -- Jazz is not dead. It just smells funny... -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the irqchip tree with the tegra tree
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 (the latter removed the code changed by the former) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgpSXpcJfvQza.pgp Description: OpenPGP digital signature