Hey Thomas, Ingo,
    So these were items I had hoped to get merged in 3.12, but I'm
guessing got buried in Thomas inbox while he was traveling/busy (and its
my fault for not cc'ing Ingo). So now 3.12-rc1 is out, I wanted to send
this in for tip/timers/core right away so these don't get missed in this
next cycle.

Please let me know if there are any objections or issues with these changes.

thanks
-john


The following changes since commit 272b98c6455f00884f0350f775c5342358ebb73f:

  Linux 3.12-rc1 (2013-09-16 16:17:51 -0400)

are available in the git repository at:

  git://git.linaro.org/people/jstultz/linux.git fortglx/3.13/time

for you to fetch changes up to 389e067032fbb96e439abafae848dd447e4cafb4:

  Merge branch 'fortglx/3.12/time' into fortglx/3.13/time (2013-09-16
18:54:07 -0700)

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

John Stultz (2):
      Merge branch 'fortglx/3.12/sched-clock64-base' into fortglx/3.13/time
      Merge branch 'fortglx/3.12/time' into fortglx/3.13/time

Miroslav Lichvar (1):
      ntp: Make periodic RTC update more reliable

Prarit Bhargava (1):
      clocksource: Fix !CONFIG_CLOCKSOURCE_WATCHDOG compile

Stephen Boyd (4):
      clocksource: Extract max nsec calculation into separate function
      sched_clock: Use seqcount instead of rolling our own
      sched_clock: Use an hrtimer instead of timer
      sched_clock: Add support for >32 bit sched_clock

Zoran Markovic (1):
      rtc: Keep system awake until all expired RTC timers are handled

 drivers/rtc/interface.c     |  13 ++++--
 include/linux/clocksource.h |   2 +
 include/linux/sched_clock.h |   2 +
 kernel/time/clocksource.c   |  46 ++++++++++++------
 kernel/time/ntp.c           |   3 +-
 kernel/time/sched_clock.c   | 111
++++++++++++++++++++++++--------------------
 6 files changed, 107 insertions(+), 70 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to