From: John Stultz <johnstul@us.ibm.com>
To: Ingo Molnar <mingo@kernel.org>
Cc: Linux Kernel <linux-kernel@vger.kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Richard Cochran <richardcochran@gmail.com>,
Prarit Bhargava <prarit@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
stable@vger.kernel.org
Subject: Re: [PATCH 1/8] ntp: Fix STA_INS/DEL clearing bug
Date: Fri, 13 Jul 2012 11:36:44 -0700 [thread overview]
Message-ID: <50006ABC.5030004@us.ibm.com> (raw)
In-Reply-To: <20120713055843.GB18065@gmail.com>
On 07/12/2012 10:58 PM, Ingo Molnar wrote:
>
> * John Stultz <john.stultz@linaro.org> wrote:
>
>> From: John Stultz <johnstul@us.ibm.com>
>>
>> In commit 6b43ae8a619d17c4935c3320d2ef9e92bdeed05d, I
>> introduced a bug that kept the STA_INS or STA_DEL bit
>> from being cleared from time_status via adjtimex()
>> without forcing STA_PLL first.
>>
>> Usually once the STA_INS is set, it isn't cleared
>> until the leap second is applied, so its unlikely this
>> affected anyone. However during testing I noticed it
>> took some effort to cancel a leap second once STA_INS
>> was set.
>>
>> This issue affects 3.4 and up.
>>
>> Since this isn't urgent (issue is only observed in testing,
>> the behavior doesn't affect ntpd, nor is a leapsecond due
>> for at least ~6 months), and we're late in the 3.5-rc
>> cycle, I'm holding this off for 3.6 merge window,
>> where I'll then backport to 3.5-stable and 3.4-stable.
>
>> CC: stable@vger.kernel.org
>
> We generally don't do such a workflow. Either it's valid for
> tip:timers/urgent and it can have a -stable tag, or it should
> not be backported, and not have a -stable tag.
>
> The rule is: if it's important enough for -stable then it's
> doubly important for the current -rc kernel!
Ok. My concern here was that if the time/hrtimer leapsecond changes were
possibly too large for merging this late in 3.5-rc, I didn't want to add
anything more to that queue.
So if you're comfortable pushing this one upstream for 3.5-rc, I'd be
happy to have it merged sooner.
thanks
-john
next prev parent reply other threads:[~2012-07-13 18:36 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-13 5:21 [PATCH 0/8] Time fixes and cleanups for 3.6 John Stultz
2012-07-13 5:21 ` [PATCH 1/8] ntp: Fix STA_INS/DEL clearing bug John Stultz
2012-07-13 5:58 ` Ingo Molnar
2012-07-13 18:36 ` John Stultz [this message]
2012-07-15 7:57 ` [tip:timers/urgent] " tip-bot for John Stultz
2012-07-13 5:21 ` [PATCH 2/8] time: Whitespace cleanups per Ingo's requests John Stultz
2012-07-15 8:56 ` [tip:timers/core] time: Whitespace cleanups per Ingo%27s requests tip-bot for John Stultz
2012-07-13 5:21 ` [PATCH 3/8] time: Explicitly use u32 instead of int for shift values John Stultz
2012-07-15 8:57 ` [tip:timers/core] " tip-bot for John Stultz
2012-07-13 5:21 ` [PATCH 4/8] time: Condense timekeeper.xtime into xtime_sec John Stultz
2012-07-13 6:00 ` Ingo Molnar
2012-07-15 8:57 ` [tip:timers/core] " tip-bot for John Stultz
2012-08-19 21:02 ` [PATCH 4/8] " Andreas Schwab
2012-08-19 21:02 ` Andreas Schwab
2012-08-20 18:58 ` John Stultz
2012-08-20 18:58 ` John Stultz
2012-08-20 19:45 ` Andreas Schwab
2012-08-20 19:45 ` Andreas Schwab
2012-08-20 19:57 ` John Stultz
2012-08-20 19:57 ` John Stultz
2012-08-20 20:04 ` Andreas Schwab
2012-08-20 20:04 ` Andreas Schwab
2012-08-21 3:38 ` John Stultz
2012-08-21 3:38 ` John Stultz
2012-08-21 7:14 ` Andreas Schwab
2012-08-21 7:14 ` Andreas Schwab
2012-08-21 18:14 ` John Stultz
2012-08-21 18:14 ` John Stultz
2012-07-13 5:21 ` [PATCH 5/8] time: Refactor accumulation of nsecs to secs John Stultz
2012-07-13 5:56 ` Ingo Molnar
2012-07-13 6:01 ` Ingo Molnar
2012-07-15 8:58 ` [tip:timers/core] " tip-bot for John Stultz
2012-07-13 5:21 ` [PATCH 6/8] time: Move arch_gettimeoffset() usage into timekeeping_get_ns() John Stultz
2012-07-13 6:03 ` Ingo Molnar
2012-07-15 8:59 ` [tip:timers/core] " tip-bot for John Stultz
2012-07-13 5:21 ` [PATCH 7/8] time: Move xtime_nsec adjustment underflow handling timekeeping_adjust John Stultz
2012-07-13 6:04 ` Ingo Molnar
2012-07-15 9:00 ` [tip:timers/core] " tip-bot for John Stultz
2012-07-13 5:21 ` [PATCH 8/8] time: Rework timekeeping functions to take timekeeper ptr as argument John Stultz
2012-07-15 9:01 ` [tip:timers/core] " tip-bot for John Stultz
2012-07-13 6:05 ` [PATCH 0/8] Time fixes and cleanups for 3.6 Ingo Molnar
2012-07-13 20:49 ` John Stultz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50006ABC.5030004@us.ibm.com \
--to=johnstul@us.ibm.com \
--cc=a.p.zijlstra@chello.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=prarit@redhat.com \
--cc=richardcochran@gmail.com \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.