Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756272Ab2EBTY3 (ORCPT ); Wed, 2 May 2012 15:24:29 -0400 Received: from na3sys009aog114.obsmtp.com ([74.125.149.211]:36668 "EHLO na3sys009aog114.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756024Ab2EBTY2 (ORCPT ); Wed, 2 May 2012 15:24:28 -0400 Date: Wed, 2 May 2012 12:19:38 -0700 From: Mike Turquette To: Mark Brown , Saravana Kannan , Shawn Guo , Sascha Hauer , Andrew Lunn , Grant Likely , h@pengutronix.de, Jamie Iles , Jeremy Kerr , Magnus Damm , Deepak Saxena , linux-arm-kernel@lists.infradead.org, Arnd Bergman , linux-arm-msm@vger.kernel.org, Rob Herring , Russell King , Thomas Gleixner , Richard Zhao , Shawn Guo , Paul Walmsley , Linus Walleij , Stephen Boyd , linux-kernel@vger.kernel.org, Amit Kucheria Subject: Re: [PATCH] clk: Use a separate struct for holding init data. Message-ID: <20120502191938.GA18180@gmail.com> References: <4F9EE84C.90106@codeaurora.org> <4F9F1659.1010804@codeaurora.org> <20120501081103.GC2194@S2101-09.ap.freescale.net> <20120501091334.GG15541@lunn.ch> <20120501170001.GB4089@opensource.wolfsonmicro.com> <4FA0258D.8020807@codeaurora.org> <20120501181922.GD4089@opensource.wolfsonmicro.com> <20120502015650.GE17311@gmail.com> <20120502051633.GH15541@lunn.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120502051633.GH15541@lunn.ch> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 995 Lines: 33 On 20120502-07:16, Andrew Lunn wrote: > > I could use some suggestions on the best way to resolve the merge issues > > we have currently. It appears that we have three bases that platforms > > need to port over the common clk framework: > > > > Russell's clkdev > > Arnd's arm-soc > > My clk-next branch > > Hi Mike > > The Orion code only depends on clk-next. I've been more conservative > with the changes, knowing that once they are merged i can add more > patches to make use of devm_get_clk() etc. > > So for my, as well as going in via arm-soc, i could also imaging > giving you a pull request and becoming part of clk-next. However, i > don't care what route they take. > Hi Andrew, The choice is yours. Regards, Mike > Andrew -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/