]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
authorIngo Molnar <mingo@kernel.org>
Wed, 10 Jul 2013 08:43:25 +0000 (10:43 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 10 Jul 2013 08:43:25 +0000 (10:43 +0200)
commit9b87df2590946bc7268553178c7d84a09111d408
treeedcd90e3134a5409339794f43d5dd4453cd72586
parentce11fc6198244a062433ef230c78e7f8954e2981
parent56df488c378641b9391703c1eb35f39717ed59c4
Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/urgent

Pull nohz updates/fixes from Frederic Weisbecker:

' Note that "watchdog: Boot-disable by default on full dynticks" is a temporary
  solution to solve the issue with the watchdog that prevents the tick from
  stopping. This is to make sure that 3.11 doesn't have that problem as several
  people complained about it.

  A proper and longer term solution has been proposed by Peterz:

          http://lkml.kernel.org/r/20130618103632.GO3204@twins.programming.kicks-ass.net
'

Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/sysctl.c
kernel/time/tick-sched.c