[GIT PULL] Timer clean-ups for 3.10, Part 2

Kukjin Kim kgene.kim at samsung.com
Fri Apr 19 06:52:16 EDT 2013


Olof Johansson wrote:
> 

[...]

> > Hrm, this is now a total mess. I can pick up Rob's preferred resolution,
> > but merging that in on top of the exynos branches causes lots of
> conflicts
> > there as well.
> >
> > I might just have to rebuild the next/ branches in question to resolve
> > this.  Either that or bring the late/clksrc stuff into the same branch
> > as the exynos timer patches.
> 
> Ok, given the complex merge fixup by Arnd (I'm not sure it's a great
> idea to add the new code in the merge commit like that, by the way),
> I've chosen to go with that as a base for late/clksrc instead, and I've
> pushed a new rebased late/clksrc that contains Arnd's version of the
> resolutions instead of Rob's. Let me know if further fixups are needed,
> in particular on exynos4 since I lack hardware to test that side.
> 
Let me test it on exynos4 in this weekend then I'll let you know.

I hope it will not be late for you.

Thanks.

- Kukjin




More information about the linux-arm-kernel mailing list