Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754216Ab3F1TAm (ORCPT ); Fri, 28 Jun 2013 15:00:42 -0400 Received: from www.linutronix.de ([62.245.132.108]:47758 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754136Ab3F1S6l (ORCPT ); Fri, 28 Jun 2013 14:58:41 -0400 Date: Fri, 28 Jun 2013 20:58:37 +0200 (CEST) From: Thomas Gleixner To: Konrad Rzeszutek Wilk cc: David Vrabel , xen-devel@lists.xen.org, LKML , John Stultz Subject: Re: [PATCHv6 0/5] xen: maintain an accurate persistent clock in more cases In-Reply-To: <20130628161954.GB2452@phenom.dumpdata.com> Message-ID: References: <1372329348-20841-1-git-send-email-david.vrabel@citrix.com> <20130628150158.GA5035@phenom.dumpdata.com> <20130628161954.GB2452@phenom.dumpdata.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1939 Lines: 41 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 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/