From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Horman Date: Tue, 26 Aug 2014 23:43:08 +0000 Subject: Re: [PATCH 3/6] clk: shmobile: Add r8a7794 support Message-Id: <20140826234307.GC9189@verge.net.au> List-Id: References: <1406299250-23975-4-git-send-email-ulrich.hecht+renesas@gmail.com> In-Reply-To: <1406299250-23975-4-git-send-email-ulrich.hecht+renesas@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-sh@vger.kernel.org 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 > > >> > > >> Signed-off-by: Hisashi Nakamura > > >> Cc: Mike Turquette > > > > > > Acked-by: Mike Turquette > > > > 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.