On Tue, May 01, 2012 at 06:56:50PM -0700, Mike Turquette 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 > > I was happy to push my changes to Linus directly (as discussed in > previous mails) but I'm starting to think that maybe having Arnd absorb > the clk-next branch as part of arm-soc would be the fastest way to > assist platforms that are porting over. > > Do the platform folks agree? Is this suggestion sane? > As one of the people who are working on platform porting, I'm not concerned about the path that clk core goes to Linus, but the time when we have a stable clk core branch appears on arm-soc either as a dependency or a downstream tree. Once we have stable branches for both rmk's clkdev and clk core appear on arm-soc, we can start asking Arnd to pull platform porting. -- Regards, Shawn -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html