From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Simon Horman <horms@verge.net.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Boris BREZILLON <b.brezillon@overkiz.com>,
Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>,
Mike Turquette <mturquette@linaro.org>
Subject: Re: linux-next: manual merge of the renesas tree with the arm-soc tree
Date: Mon, 16 Dec 2013 11:00:54 +0100 [thread overview]
Message-ID: <52AECF56.8020508@atmel.com> (raw)
In-Reply-To: <20131216104738.6f845aabd0e3b609ed9ca170@canb.auug.org.au>
On 16/12/2013 00:47, Stephen Rothwell :
> Hi Simon,
>
> Today's linux-next merge of the renesas tree got a conflict in
> drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
> base support") from the arm-soc tree and commit 10cdfe9f327a ("clk:
> shmobile: Add R-Car Gen2 clocks support") from the renesas tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Fine for me.
Thanks. Bye,
--
Nicolas Ferre
next prev parent reply other threads:[~2013-12-16 10:00 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-15 23:47 linux-next: manual merge of the renesas tree with the arm-soc tree Stephen Rothwell
2013-12-16 10:00 ` Nicolas Ferre [this message]
2013-12-17 0:19 ` Simon Horman
2014-01-04 5:11 ` Olof Johansson
2014-01-04 11:43 ` Stephen Rothwell
2014-01-05 5:54 ` Simon Horman
2014-01-06 9:44 ` Nicolas Ferre
2014-01-08 16:56 ` Mike Turquette
-- strict thread matches above, loose matches on Subject: below --
2016-02-24 22:07 Stephen Rothwell
2015-12-02 11:21 Mark Brown
2015-12-02 11:35 ` Arnd Bergmann
2015-07-26 23:32 Stephen Rothwell
2015-07-26 23:27 Stephen Rothwell
2015-01-15 0:38 Stephen Rothwell
2015-01-15 8:44 ` Geert Uytterhoeven
2014-05-22 2:12 Stephen Rothwell
2013-04-19 6:59 Stephen Rothwell
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=52AECF56.8020508@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=arnd@arndb.de \
--cc=b.brezillon@overkiz.com \
--cc=horms@verge.net.au \
--cc=laurent.pinchart+renesas@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mturquette@linaro.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).