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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150316100457.GF30817@ulmo.nvidia.com>
Date:	Mon, 16 Mar 2015 11:04:58 +0100
From:	Thierry Reding <treding@...dia.com>
To:	Jason Cooper <jason@...edaemon.net>
CC:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Stephen Warren <swarren@...dia.com>,
	Colin Cross <ccross@...roid.com>,
	Olof Johansson <olof@...om.net>, <linux-next@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>,
	Marc Zyngier <marc.zyngier@....com>,
	Bob Mottram <bob.mottram@...ethink.co.uk>
Subject: 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

Content of type "application/pgp-signature" skipped