tree 584e5077160abcbf4d13eb03ff42ed58d87c1a90
parent c0be92b5b14bc6928363527602dabff57875473a
parent 882a78a9f39f5535b209b4aa0a1741e35b8c67fb
author Linus Torvalds <torvalds@linux-foundation.org> 1537034437 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1537034437 -1000

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull scheduler fixes from Ingo Molnar:
 "Misc fixes: various scheduler metrics corner case fixes, a
  sched_features deadlock fix, and a topology fix for certain NUMA
  systems"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/fair: Fix kernel-doc notation warning
  sched/fair: Fix load_balance redo for !imbalance
  sched/fair: Fix scale_rt_capacity() for SMT
  sched/fair: Fix vruntime_normalized() for remote non-migration wakeup
  sched/pelt: Fix update_blocked_averages() for RT and DL classes
  sched/topology: Set correct NUMA topology type
  sched/debug: Fix potential deadlock when writing to sched_features