lkml.org 
[lkml]   [2015]   [Mar]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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.


\
 
 \ /
  Last update: 2015-03-18 20:21    [W:0.267 / U:0.236 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site