Messages in this thread | | | Date | Fri, 5 Jul 2013 14:10:04 -0700 | From | Sören Brinkmann <> | Subject | Re: [PATCH] clocksource/cadence_ttc: Reuse clocksource as sched_clock |
| |
On Fri, Jul 05, 2013 at 10:59:53PM +0200, Thomas Gleixner wrote: > On Fri, 5 Jul 2013, Sören Brinkmann wrote: > > On Fri, Jul 05, 2013 at 10:42:03PM +0200, Thomas Gleixner wrote: > > > We have a mechanism for that in place, if stuff goes cross trees. One > > > of the trees provides a set of commit for the other tree to pull, so > > > we do not end up with merge dependencies and conflicts. > > > > > > Why is clocksource stuff going through armsoc unless it contains > > > related modifications in arch/arm/ > > We overhauled Zynq's common clock code and migrated all Zynq drivers to > > it - the TTC being one. I'm pretty sure you were on the CC list for that > > change. > > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=30e1e28598c2674c133148d8aec6d431d7acd314 > > > > That's fine as it has no dependencies on any of the clocksource core > changes AFAICT. Right, shouldn't be a big deal. Just for this patch, I currently have the choice of working with the old TTC but the new clocksource core or the other way around. But since everything is going to meet in Linus' tree soon, I just wait a bit until tip/timers is merged.
Sören
-- 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/
| |