From: Thierry Reding <treding@nvidia.com>
To: Jason Cooper <jason@lakedaemon.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Stephen Warren <swarren@nvidia.com>,
Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>,
<linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Marc Zyngier <marc.zyngier@arm.com>,
Bob Mottram <bob.mottram@codethink.co.uk>
Subject: Re: linux-next: manual merge of the irqchip tree with the tegra tree
Date: Mon, 16 Mar 2015 11:04:58 +0100 [thread overview]
Message-ID: <20150316100457.GF30817@ulmo.nvidia.com> (raw)
In-Reply-To: <20150316145508.62cad7d0@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 983 bytes --]
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
[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2015-03-16 10:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-16 3:55 linux-next: manual merge of the irqchip tree with the tegra tree Stephen Rothwell
2015-03-16 8:47 ` Marc Zyngier
2015-03-16 10:04 ` Thierry Reding [this message]
2015-03-17 13:21 ` Jason Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150316100457.GF30817@ulmo.nvidia.com \
--to=treding@nvidia.com \
--cc=bob.mottram@codethink.co.uk \
--cc=ccross@android.com \
--cc=jason@lakedaemon.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=swarren@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox