From mboxrd@z Thu Jan 1 00:00:00 1970 From: Krzysztof Kozlowski Subject: Re: [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks Date: Wed, 29 Jan 2014 11:29:04 +0100 Message-ID: <1390991344.2207.8.camel@AMDC1943> References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Return-path: Received: from mailout1.w1.samsung.com ([210.118.77.11]:13335 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750882AbaA2K3J (ORCPT ); Wed, 29 Jan 2014 05:29:09 -0500 In-reply-to: References: In-reply-to: Sender: linux-samsung-soc-owner@vger.kernel.org List-Id: linux-samsung-soc@vger.kernel.org To: Mike Turquette Cc: lkml , "linux-arm-kernel@lists.infradead.org" , linux-samsung-soc , Lee Jones , Kgene Kim , Patch Tracking , Mark Brown , Tushar Behera Hi, > > Quoting Mark Brown (2013-12-31 08:09:16) > > On Mon, Dec 30, 2013 at 09:33:50AM +0530, Tushar Behera wrote: > > > > > Commit 1b1ccee1e821 "mfd: s2mps11: Fix build after regmap field rename > > > in sec-core.c" is also touching this file, which is in Mark's tree > > > right now. If I rebase > > > > It's been in Linus' tree for a while now. > > OK, so I merged the two patches into clk-next, then merged clk-next into > next-20131224 and the merge is super trivial to resolve. So I propose > that we just let it get resolved in linux-next the usual way. > > Any objections? If not I'll take these two patches into clk-next. Did you merged these patches into clk-next? Unfortunately I couldn't find them (clk-next, next). I am asking because I want to send patches with support for S2MPS14 clock (based on these patches). Best regards, Krzysztof