From: John Stultz <johnstul@us.ibm.com>
To: Thomas Gleixner <tglx@linutronix.de>, "Molnar, Ingo" <mingo@elte.hu>
Cc: lkml <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] Time/alarmtimer changes for 3.7
Date: Fri, 28 Sep 2012 15:07:36 -0700 [thread overview]
Message-ID: <50661FA8.9090801@us.ibm.com> (raw)
In-Reply-To: <50608EE1.3050401@linaro.org>
Hey Thomas,
I just updated my fortglx/3.7/time branch to include and resolve
the collision with Arnd's LATCH fix. Just wanted to give you a heads up
so you weren't surprised by the additional change.
Full pull request below.
thanks
-john
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 28f2b02bc581ffc835bc1691b18d03f62fcf0395:
Merge branch 'arnds-jiffies-fix' into fortglx/3.7/time (2012-09-28 18:00:27 -0400)
----------------------------------------------------------------
Arnd Bergmann (1):
time/jiffies: bring back unconditional LATCH definition
John Stultz (12):
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
Merge branch 'arnds-jiffies-fix' into fortglx/3.7/time
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 | 20 +-----
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, 282 insertions(+), 260 deletions(-)
create mode 100644 include/linux/timekeeper_internal.h
prev parent reply other threads:[~2012-09-28 22:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-24 16:48 [GIT PULL] Time/alarmtimer changes for 3.7 John Stultz
2012-09-24 20:25 ` John Stultz
2012-09-28 22:07 ` John Stultz [this message]
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=50661FA8.9090801@us.ibm.com \
--to=johnstul@us.ibm.com \
--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 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.