From: Jason Cooper <jason@lakedaemon.net>
To: Thierry Reding <treding@nvidia.com>
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: Tue, 17 Mar 2015 13:21:29 +0000 [thread overview]
Message-ID: <20150317132129.GB3368@io.lakedaemon.net> (raw)
In-Reply-To: <20150316100457.GF30817@ulmo.nvidia.com>
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.
prev parent reply other threads:[~2015-03-17 13:21 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
2015-03-17 13:21 ` Jason Cooper [this message]
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=20150317132129.GB3368@io.lakedaemon.net \
--to=jason@lakedaemon.net \
--cc=bob.mottram@codethink.co.uk \
--cc=ccross@android.com \
--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 \
--cc=treding@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