[PATCHv3 00/27] ARM: OMAP2+: clock code move under clk driver
sboyd at codeaurora.org
Mon Jul 13 13:26:17 PDT 2015
On 07/13/2015 02:48 AM, Tero Kristo wrote:
> On 06/04/2015 02:11 AM, Michael Turquette wrote:
>> Hi Tero,
>> I'd like more time for any regressions this introduces to be fixed, so
>> lets push back to next merge window. The always-wrong-but-never-by-much
>> crystal ball predicts June 14. This is less than two weeks away, so
>> the wait should be short.
> Hi Mike / Stephen,
> I am planning to send a pull-request out for this, but this set is
> going to cause some minor merge conflicts with the recent header file
> change patches from Stephen, and the determine rate prototype change
> from Boris.
> I can alternatively just ignore these issues and send these patches on
> top of rc2 and let you handle the conflicts within clk-tree, or
> cherry-pick some stable commits for the same if you like.
> Which way do you prefer?
It doesn't sound too bad to resolve those conflicts so send the branch
that you already made based on v4.1-rc2.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
More information about the linux-arm-kernel