From: Jason Cooper <jason@lakedaemon.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ralf Baechle <ralf@linux-mips.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andrew Bresticker <abrestic@chromium.org>,
Yingjoe Chen <yingjoe.chen@mediatek.com>
Subject: Re: linux-next: manual merge of the irqchip tree with the mips tree
Date: Thu, 27 Nov 2014 13:11:43 -0500 [thread overview]
Message-ID: <20141127181143.GN22670@titan.lakedaemon.net> (raw)
In-Reply-To: <20141127165719.2e5cb4e4@canb.auug.org.au>
Stephen,
On Thu, Nov 27, 2014 at 04:57:19PM +1100, Stephen Rothwell wrote:
> Hi Jason,
>
> Today's linux-next merge of the irqchip tree got a conflict in
> drivers/irqchip/Makefile between commit 8a19b8f19429 ("MIPS: Move GIC
> to drivers/irqchip/") from the mips tree and commit 5fe3bba3088c
> ("irqchip: mtk-sysirq: Add sysirq interrupt polarity support") from the
> irqchip tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks!
thx,
Jason.
prev parent reply other threads:[~2014-11-27 18:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-27 5:57 Stephen Rothwell
2014-11-27 18:11 ` 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=20141127181143.GN22670@titan.lakedaemon.net \
--to=jason@lakedaemon.net \
--cc=abrestic@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ralf@linux-mips.org \
--cc=sfr@canb.auug.org.au \
--cc=yingjoe.chen@mediatek.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
all inboxes | Powered by JetHome®