Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762032Ab0HFUZq (ORCPT ); Fri, 6 Aug 2010 16:25:46 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:46262 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752473Ab0HFUZn convert rfc822-to-8bit (ORCPT ); Fri, 6 Aug 2010 16:25:43 -0400 MIME-Version: 1.0 In-Reply-To: References: From: Linus Torvalds Date: Fri, 6 Aug 2010 13:25:22 -0700 Message-ID: Subject: Re: [GIT pull] timekeeping updates for 2.6.36 To: Thomas Gleixner , Paul Mackerras , Benjamin Herrenschmidt Cc: Andrew Morton , Ingo Molnar , LKML Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1008 Lines: 23 On Thu, Aug 5, 2010 at 3:19 PM, Thomas Gleixner wrote: > > Please pull the latest timers-timekeeping-for-linus git tree from: > > ? git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git timers-timekeeping-for-linus > > It contains two cherry-picks from the powerpc tree which have changes > in the same area of code. John Stultz selected them with the powerpc > folks to avoid complex fixups in next. Well, it just resulted in another merge conflict, but I resolved it the same way you had resolved your cherry-picks. However, I wanted to let people know, so that the powerpc guys can re-verify that whole vsyscall timer change. So Paul, Ben, please check out that I didn't screw something up in there. Linus -- 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/