On Fri, 28 Jun 2013, Konrad Rzeszutek Wilk wrote: > On Fri, Jun 28, 2013 at 05:12:35PM +0200, Thomas Gleixner wrote: > > On Fri, 28 Jun 2013, Konrad Rzeszutek Wilk wrote: > > > On Fri, Jun 28, 2013 at 03:14:42PM +0200, Thomas Gleixner wrote: > > > > On Thu, 27 Jun 2013, David Vrabel wrote: > > > > > These series fixes the above limitations and depends on "x86: increase > > > > > precision of x86_platform.get/set_wallclock()" which was previously > > > > > posted. > > > > > > > > So I'd like to merge that in the following way: > > > > > > > > I pick up patches 1-3 and stick them into tip timers/for-xen and merge > > > > that branch into timers/core. When picking up 1/6, I'll drop the xen > > > > part of that, so timers/core will not hold any xen specific bits. > > > > > > > > Then the xen folks can pull timers/for-xen and apply the xen specific > > > > stuff on top. > > > > > > Wouldn't it be easier for you to pick the "xen part of that" as well? > > > I am OK with you doing that and it all going through your tree. > > > > I can do that, if that's not conflicting with other xen/x86 stuff > > outside of timers/core. > > I got one change in there and it seems to apply cleanly (woot!). > But lets be on a safe side. There are also some Xen ARM changes that > are fiddling with arch/x86/xen/time.c (different maintainer)) - so both > me and Stefano can pull from the timers/for-xen and not have to worry about > conflict resolution.
Hrmpf, just noticed, that it depends on other stuff in timers/core: ce0b098: x86: Fix vrtc_get_time/set_mmss to use new timespec interface 3565184: x86: Increase precision of x86_platform.get/set_wallclock() /me rumages for frozen shark. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
