From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Oct 2008 20:19:56 +0000 (-0700)
Subject: Merge branch 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~17190
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=99ebcf8285df28f32fd2d1c19a7166e70f00309c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'v28-timers-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (36 commits)
  fix documentation of sysrq-q really
  Fix documentation of sysrq-q
  timer_list: add base address to clock base
  timer_list: print cpu number of clockevents device
  timer_list: print real timer address
  NOHZ: restart tick device from irq_enter()
  NOHZ: split tick_nohz_restart_sched_tick()
  NOHZ: unify the nohz function calls in irq_enter()
  timers: fix itimer/many thread hang, fix
  timers: fix itimer/many thread hang, v3
  ntp: improve adjtimex frequency rounding
  timekeeping: fix rounding problem during clock update
  ntp: let update_persistent_clock() sleep
  hrtimer: reorder struct hrtimer to save 8 bytes on 64bit builds
  posix-timers: lock_timer: make it readable
  posix-timers: lock_timer: kill the bogus ->it_id check
  posix-timers: kill ->it_sigev_signo and ->it_sigev_value
  posix-timers: sys_timer_create: cleanup the error handling
  posix-timers: move the initialization of timer->sigq from send to create path
  posix-timers: sys_timer_create: simplify and s/tasklist/rcu/
  ...

Fix trivial conflicts due to sysrq-q description clahes in
Documentation/sysrq.txt and drivers/char/sysrq.c
---

99ebcf8285df28f32fd2d1c19a7166e70f00309c
diff --cc Documentation/sysrq.txt
index 49378a9f2b5f,7b3b069c376e..10a0263ebb3f
--- a/Documentation/sysrq.txt
+++ b/Documentation/sysrq.txt
@@@ -95,8 -95,8 +95,9 @@@ On all -  write a character to /proc/sy
  
  'p'     - Will dump the current registers and flags to your console.
  
- 'q'     - Will dump a list of all running hrtimers.
- 	  WARNING: Does not cover any other timers
 -'q'     - Will dump per CPU lists of all armed hrtimers (not timer_list timers)
 -	  and detailed information about all clockevent devices.
++'q'     - Will dump per CPU lists of all armed hrtimers (but NOT regular
++          timer_list timers) and detailed information about all
++          clockevent devices.
  
  'r'     - Turns off keyboard raw mode and sets it to XLATE.