On Fri, 2012-06-15 at 11:56 -0700, John Stultz wrote:

Hey Greg,
     Forgot to cc stable on this one. Thanks to Dave Jones for noticing!
-john

------------------

From: Richard Cochran<richardcochran@gmail.com>

commit dd48d708ff3e917f6d6b6c2b696c3f18c019feed upstream.

When repeating a UTC time value during a leap second (when the UTC

time should be 23:59:60), the TAI timescale should not stop. The kernel

NTP code increments the TAI offset one second too late. This patch fixes

the issue by incrementing the offset during the leap second itself.

[...]

This doesn't apply to 3.2.y, unsurprisingly.  Let me know if there are
any urgent leap second fixes that will be needed there.

Ben.

-- 
Ben Hutchings
Time is nature's way of making sure that everything doesn't happen at once.