diff options
| author | Linus Torvalds <[email protected]> | 2015-06-24 15:09:40 -0700 | 
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2015-06-24 15:09:40 -0700 | 
| commit | 98ec21a01896751b673b6c731ca8881daa8b2c6d (patch) | |
| tree | 9d6d780675436efc894878475284c70f766126dd /fs/xfs/libxfs/xfs_ialloc.c | |
| parent | a262948335bc5359b82f0ed5ef35f6e82ca44d16 (diff) | |
| parent | cbce1a686700595de65ee363b9b3283ae85d8fc5 (diff) | |
Merge branch 'sched-hrtimers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler updates from Thomas Gleixner:
 "This series of scheduler updates depends on sched/core and timers/core
  branches, which are already in your tree:
   - Scheduler balancing overhaul to plug a hard to trigger race which
     causes an oops in the balancer (Peter Zijlstra)
   - Lockdep updates which are related to the balancing updates (Peter
     Zijlstra)"
* 'sched-hrtimers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched,lockdep: Employ lock pinning
  lockdep: Implement lock pinning
  lockdep: Simplify lock_release()
  sched: Streamline the task migration locking a little
  sched: Move code around
  sched,dl: Fix sched class hopping CBS hole
  sched, dl: Convert switched_{from, to}_dl() / prio_changed_dl() to balance callbacks
  sched,dl: Remove return value from pull_dl_task()
  sched, rt: Convert switched_{from, to}_rt() / prio_changed_rt() to balance callbacks
  sched,rt: Remove return value from pull_rt_task()
  sched: Allow balance callbacks for check_class_changed()
  sched: Use replace normalize_task() with __sched_setscheduler()
  sched: Replace post_schedule with a balance callback list
Diffstat (limited to 'fs/xfs/libxfs/xfs_ialloc.c')
0 files changed, 0 insertions, 0 deletions