public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: John Stultz <john.stultz@linaro.org>
To: Thomas Gleixner <tglx@linutronix.de>, "Molnar, Ingo" <mingo@elte.hu>
Cc: lkml <linux-kernel@vger.kernel.org>
Subject: [GIT PULL] Time/alarmtimer changes for 3.7
Date: Mon, 24 Sep 2012 09:48:33 -0700	[thread overview]
Message-ID: <50608EE1.3050401@linaro.org> (raw)

Hey Thomas, Ingo,
	Here's my queue for 3.7 for tip/timers/core. Unfortunately
tip/timers/core is still 3.5 based, and this depends on items that
landed in 3.6 (and that are waiting in tip/timers/urgent), so its based
off of tip/timers/urgent, but merges cleanly with tip/timers/core.

Let me know if you have any thoughts or requests for changes here.

thanks
-john

PS: Just a reminder that there is still a pending change in
tip/timers/urgent that I'd hope to get into 3.6.


The following changes since commit ec145babe754f9ea1079034a108104b6001e001c:

   time: Fix timeekeping_get_ns overflow on 32bit systems (2012-09-13 17:39:14 +0200)

are available in the git repository at:

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

for you to fetch changes up to 650ea02475106e8d6bdf561896d2ffe0d1c0ebb4:

   time: Convert x86_64 to using new update_vsyscall (2012-09-24 12:38:09 -0400)

----------------------------------------------------------------
John Stultz (11):
       alarmtimer: Use hrtimer per-alarm instead of per-base
       alarmtimer: Remove unused helpers & defines
       alarmtimer: Rename alarmtimer_remove to alarmtimer_dequeue
       jiffies: Kill unused TICK_USEC_TO_NSEC
       jiffies: Remove compile time assumptions about CLOCK_TICK_RATE
       time: Move timekeeper structure to timekeeper_internal.h for vsyscall changes
       time: Move update_vsyscall definitions to timekeeper_internal.h
       time: Convert CONFIG_GENERIC_TIME_VSYSCALL to CONFIG_GENERIC_TIME_VSYSCALL_OLD
       time: Introduce new GENERIC_TIME_VSYSCALL
       time: Only do nanosecond rounding on GENERIC_TIME_VSYSCALL_OLD systems
       time: Convert x86_64 to using new update_vsyscall

Todd Poynor (1):
       alarmtimer: Implement minimum alarm interval for allowing suspend

  arch/ia64/Kconfig                   |    2 +-
  arch/ia64/kernel/time.c             |    4 +-
  arch/powerpc/Kconfig                |    2 +-
  arch/powerpc/kernel/time.c          |    4 +-
  arch/s390/Kconfig                   |    2 +-
  arch/s390/kernel/time.c             |    4 +-
  arch/x86/include/asm/vgtod.h        |    4 +-
  arch/x86/kernel/setup.c             |    3 +
  arch/x86/kernel/vsyscall_64.c       |   49 +++++++++------
  arch/x86/vdso/vclock_gettime.c      |   22 ++++---
  include/linux/alarmtimer.h          |   31 +--------
  include/linux/clocksource.h         |   16 -----
  include/linux/jiffies.h             |   21 +------
  include/linux/timekeeper_internal.h |  108 ++++++++++++++++++++++++++++++++
  kernel/time.c                       |    2 +-
  kernel/time/Kconfig                 |    4 ++
  kernel/time/alarmtimer.c            |  118 +++++++++++++----------------------
  kernel/time/jiffies.c               |   32 +++++++++-
  kernel/time/timekeeping.c           |  115 ++++++++++------------------------
  19 files changed, 281 insertions(+), 262 deletions(-)
  create mode 100644 include/linux/timekeeper_internal.h


             reply	other threads:[~2012-09-24 16:49 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-24 16:48 John Stultz [this message]
2012-09-24 20:25 ` [GIT PULL] Time/alarmtimer changes for 3.7 John Stultz
2012-09-28 22:07 ` 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=50608EE1.3050401@linaro.org \
    --to=john.stultz@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox