From patchwork Tue Jul 24 14:33:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 172892 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 0820D2C0090 for ; Wed, 25 Jul 2012 00:33:41 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1StgAz-00034l-E3; Tue, 24 Jul 2012 14:33:29 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1StgAw-00034g-Vy for kernel-team@lists.ubuntu.com; Tue, 24 Jul 2012 14:33:27 +0000 Received: from av-217-129-137-172.netvisao.pt ([217.129.137.172] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1StgAw-0004er-N3 for kernel-team@lists.ubuntu.com; Tue, 24 Jul 2012 14:33:26 +0000 From: Luis Henriques To: kernel-team@lists.ubuntu.com Subject: Re: [pull-request][SRU Lucid][PATCH 00/11] Leap-second fix for Lucid References: <1343064279-28091-1-git-send-email-luis.henriques@canonical.com> Date: Tue, 24 Jul 2012 15:33:23 +0100 In-Reply-To: <1343064279-28091-1-git-send-email-luis.henriques@canonical.com> (Luis Henriques's message of "Mon, 23 Jul 2012 18:24:28 +0100") Message-ID: <87vchdmdos.fsf@canonical.com> User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.1.50 (gnu/linux) MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com The following changes since commit 086a965a904e787ab151027afd6fa3d043ebc9af: UBUNTU: Bump ABI (2012-07-24 10:30:16 +0100) are available in the git repository at: git://kernel.ubuntu.com/henrix/ubuntu-lucid.git leap-second-fix for you to fetch changes up to 86947448e3b0cb7ecdfc28c7a7aa89c802353d67: 2.6.32.x: timekeeping: Add missing update call in timekeeping_resume() (2012-07-24 10:30:46 +0100) ---------------------------------------------------------------- John Stultz (5): 2.6.32.x: ntp: Fix leap-second hrtimer livelock 2.6.32.x: timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond 2.6.32.x: hrtimer: Provide clock_was_set_delayed() 2.6.32.x: timekeeping: Fix leapsecond triggered load spike issue 2.6.32.x: hrtimer: Update hrtimer base offsets each hrtimer_interrupt Richard Cochran (1): 2.6.32.x: ntp: Correct TAI offset during leap second Thomas Gleixner (5): 2.6.32.x: time: Move common updates to a function 2.6.32.x: timekeeping: Maintain ktime_t based offsets for hrtimers 2.6.32.x: hrtimers: Move lock held region in hrtimer_interrupt() 2.6.32.x: timekeeping: Provide hrtimer update function 2.6.32.x: timekeeping: Add missing update call in timekeeping_resume() include/linux/hrtimer.h | 9 +++- include/linux/timex.h | 2 +- kernel/hrtimer.c | 52 ++++++++++++------- kernel/time/ntp.c | 124 +++++++++++++++------------------------------ kernel/time/timekeeping.c | 93 ++++++++++++++++++++++++++++------ 5 files changed, 162 insertions(+), 118 deletions(-)