From: Simon Horman <horms@verge.net.au>
To: linux-sh@vger.kernel.org
Subject: Re: [PATCH 3/6] clk: shmobile: Add r8a7794 support
Date: Tue, 26 Aug 2014 23:43:08 +0000 [thread overview]
Message-ID: <20140826234307.GC9189@verge.net.au> (raw)
In-Reply-To: <1406299250-23975-4-git-send-email-ulrich.hecht+renesas@gmail.com>
On Tue, Aug 26, 2014 at 02:41:33PM +0200, Laurent Pinchart wrote:
> Hi Magnus,
>
> On Tuesday 26 August 2014 20:50:53 Magnus Damm wrote:
> > Hi Mike,
> >
> > [CC Simon and Laurent]
> >
> > On Sat, Jul 26, 2014 at 4:44 AM, Mike Turquette wrote:
> > > Quoting Ulrich Hecht (2014-07-25 07:40:47)
> > >
> > >> From: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
> > >>
> > >> Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
> > >> Cc: Mike Turquette <mturquette@linaro.org>
> > >
> > > Acked-by: Mike Turquette <mturquette@linaro.org>
> >
> > Thanks!
> >
> > > Are you taking this through arm-soc?
> >
> > Good question. Simon, do you have any preference how to merge this?
> >
> > Perhaps Laurent remembers how we dealt with the earlier SoCs?
>
> As far as git log remembers, they have been merged through Mike's tree.
>
> It all depends on how we want to merge the rest of the series. The risk of
> conflict on this specific patch is low, so it can go through Simon's tree if
> it helps resolving dependencies with the rest of the series.
I don't think there are any dependencies.
But as the risk of conflicts is low I'll see about taking
it through my tree anyway.
prev parent reply other threads:[~2014-08-26 23:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-25 14:40 [PATCH 3/6] clk: shmobile: Add r8a7794 support Ulrich Hecht
2014-07-25 19:44 ` Mike Turquette
2014-08-26 11:50 ` Magnus Damm
2014-08-26 12:41 ` Laurent Pinchart
2014-08-26 23:38 ` Simon Horman
2014-08-26 23:43 ` Simon Horman [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=20140826234307.GC9189@verge.net.au \
--to=horms@verge.net.au \
--cc=linux-sh@vger.kernel.org \
/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).