diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-12 12:36:59 -0400 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-12 12:36:59 -0400 | 
| commit | 7b732169e9d1f0f6614a8e85a9e65a9d755b3d86 (patch) | |
| tree | e845125123c303d87e14f8ce981f7149ef071ef5 /net/switchdev/switchdev.c | |
| parent | c4bc680cf7bcd257865dac97dd2debbc9dcffad4 (diff) | |
| parent | c4d029f2d43b39de7b9299e8b58102a442ba86f8 (diff) | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
 "This update from the timer departement contains:
   - A series of patches which address a shortcoming in the tick
     broadcast code.
     If the broadcast device is not available or an hrtimer emulated
     broadcast device, some of the original assumptions lead to boot
     failures.  I rather plugged all of the corner cases instead of only
     addressing the issue reported, so the change got a little larger.
     Has been extensivly tested on x86 and arm.
   - Get rid of the last holdouts using do_posix_clock_monotonic_gettime()
   - A regression fix for the imx clocksource driver
   - An update to the new state callbacks mechanism for clockevents.
     This is required to simplify the conversion, which will take place
     in 4.3"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tick/broadcast: Prevent NULL pointer dereference
  time: Get rid of do_posix_clock_monotonic_gettime
  cris: Replace do_posix_clock_monotonic_gettime()
  tick/broadcast: Unbreak CONFIG_GENERIC_CLOCKEVENTS=n build
  tick/broadcast: Handle spurious interrupts gracefully
  tick/broadcast: Check for hrtimer broadcast active early
  tick/broadcast: Return busy when IPI is pending
  tick/broadcast: Return busy if periodic mode and hrtimer broadcast
  tick/broadcast: Move the check for periodic mode inside state handling
  tick/broadcast: Prevent deep idle if no broadcast device available
  tick/broadcast: Make idle check independent from mode and config
  tick/broadcast: Sanity check the shutdown of the local clock_event
  tick/broadcast: Prevent hrtimer recursion
  clockevents: Allow set-state callbacks to be optional
  clocksource/imx: Define clocksource for mx27
Diffstat (limited to 'net/switchdev/switchdev.c')
0 files changed, 0 insertions, 0 deletions
