public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] More timekeeping items for 3.13
@ 2013-10-10  4:09 John Stultz
  2013-10-10  4:30 ` Ingo Molnar
  0 siblings, 1 reply; 3+ messages in thread
From: John Stultz @ 2013-10-10  4:09 UTC (permalink / raw)
  To: Thomas Gleixner; +Cc: Ingo Molnar, LKML

Hey Thomas,
    Just wanted to send along the few minor time related items I've got
left for 3.13.

* Small cleanup in the clocksource code.

* Fix for rtc-pl031 to let it work with alarmtimers

* Move arm64 to using the generic sched_clock framework & resulting
cleanup in the generic sched_clock code.


thanks
-john


The following changes since commit 389e067032fbb96e439abafae848dd447e4cafb4:

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

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 b4042ceaabbd913bc5b397ddd1e396eeb312d72f:

  sched_clock: Remove sched_clock_func() hook (2013-10-09 16:54:39 -0700)

----------------------------------------------------------------
Elad Wexler (1):
      clocksource: Fix 'ret' data type of sysfs_override_clocksource()
and sysfs_unbind_clocksource()

John Stultz (1):
      rtc: rtc-pl031: Set wakeup flag prior to registering rtcdev

Stephen Boyd (2):
      arch_timer: Move to generic sched_clock framework
      sched_clock: Remove sched_clock_func() hook

 arch/arm/kernel/arch_timer.c         | 14 --------------
 arch/arm64/Kconfig                   |  1 +
 arch/arm64/kernel/time.c             | 10 ----------
 drivers/clocksource/arm_arch_timer.c | 10 ++++++++++
 drivers/rtc/rtc-pl031.c              |  3 +--
 include/linux/sched_clock.h          |  2 --
 kernel/time/clocksource.c            |  4 ++--
 kernel/time/sched_clock.c            |  9 +--------
 8 files changed, 15 insertions(+), 38 deletions(-)

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [GIT PULL] More timekeeping items for 3.13
  2013-10-10  4:09 [GIT PULL] More timekeeping items for 3.13 John Stultz
@ 2013-10-10  4:30 ` Ingo Molnar
  2013-10-10  4:45   ` John Stultz
  0 siblings, 1 reply; 3+ messages in thread
From: Ingo Molnar @ 2013-10-10  4:30 UTC (permalink / raw)
  To: John Stultz; +Cc: Thomas Gleixner, LKML


* John Stultz <john.stultz@linaro.org> wrote:

> Hey Thomas,
>     Just wanted to send along the few minor time related items I've got
> left for 3.13.
> 
> * Small cleanup in the clocksource code.
> 
> * Fix for rtc-pl031 to let it work with alarmtimers
> 
> * Move arm64 to using the generic sched_clock framework & resulting
> cleanup in the generic sched_clock code.
> 
> 
> thanks
> -john
> 
> 
> The following changes since commit 389e067032fbb96e439abafae848dd447e4cafb4:
> 
>   Merge branch 'fortglx/3.12/time' into fortglx/3.13/time (2013-09-16
> 18:54:07 -0700)
> 
> 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 b4042ceaabbd913bc5b397ddd1e396eeb312d72f:
> 
>   sched_clock: Remove sched_clock_func() hook (2013-10-09 16:54:39 -0700)
> 
> ----------------------------------------------------------------
> Elad Wexler (1):
>       clocksource: Fix 'ret' data type of sysfs_override_clocksource()
> and sysfs_unbind_clocksource()
> 
> John Stultz (1):
>       rtc: rtc-pl031: Set wakeup flag prior to registering rtcdev
> 
> Stephen Boyd (2):
>       arch_timer: Move to generic sched_clock framework
>       sched_clock: Remove sched_clock_func() hook
> 
>  arch/arm/kernel/arch_timer.c         | 14 --------------
>  arch/arm64/Kconfig                   |  1 +
>  arch/arm64/kernel/time.c             | 10 ----------
>  drivers/clocksource/arm_arch_timer.c | 10 ++++++++++
>  drivers/rtc/rtc-pl031.c              |  3 +--
>  include/linux/sched_clock.h          |  2 --
>  kernel/time/clocksource.c            |  4 ++--
>  kernel/time/sched_clock.c            |  9 +--------
>  8 files changed, 15 insertions(+), 38 deletions(-)

Pulled into tip:timers/core, thanks John!

One small detail I noticed, in commit 07783397c:

    Cc: Linus Walleij <linus.walleij@linaro.org>
    Acked-by: Linus Walleij <linus.walleij@linaro.org>

Please remove the Cc: line in such cases in the future.

Thanks,

	Ingo

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [GIT PULL] More timekeeping items for 3.13
  2013-10-10  4:30 ` Ingo Molnar
@ 2013-10-10  4:45   ` John Stultz
  0 siblings, 0 replies; 3+ messages in thread
From: John Stultz @ 2013-10-10  4:45 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: Thomas Gleixner, LKML

On 10/09/2013 09:30 PM, Ingo Molnar wrote:
> Pulled into tip:timers/core, thanks John!
>
> One small detail I noticed, in commit 07783397c:
>
>     Cc: Linus Walleij <linus.walleij@linaro.org>
>     Acked-by: Linus Walleij <linus.walleij@linaro.org>
>
> Please remove the Cc: line in such cases in the future.

Ah, yes. I'll try to be more careful about that. Sorry!

-john

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-10-10  4:45 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-10  4:09 [GIT PULL] More timekeeping items for 3.13 John Stultz
2013-10-10  4:30 ` Ingo Molnar
2013-10-10  4:45   ` John Stultz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox