From: Marc Zyngier <marc.zyngier@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Jason Cooper <jason@lakedaemon.net>,
Stephen Warren <swarren@nvidia.com>,
Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>,
Thierry Reding <treding@nvidia.com>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
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 08:47:52 +0000 [thread overview]
Message-ID: <550698B8.80108@arm.com> (raw)
In-Reply-To: <20150316145508.62cad7d0@canb.auug.org.au>
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...
next prev parent reply other threads:[~2015-03-16 8:47 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 [this message]
2015-03-16 10:04 ` Thierry Reding
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=550698B8.80108@arm.com \
--to=marc.zyngier@arm.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=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