Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Sep 2017 18:30:56 +0000 (11:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Sep 2017 18:30:56 +0000 (11:30 -0700)
commit040b9d7ccff40e1fbd48029e3c769db188a3ba2c
tree43ab6312d5108302c4b67753597850275a9ee4ed
parente6328a7abe7f8fcd32e9d3bcbd14ff2161bf71c9
parent46123355af729514e6fa8b8a9dd1e645e61a6466
Merge branch 'sched-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull scheduler fixes from Ingo Molnar:
 "Three fixes:

   - fix a suspend/resume cpusets bug

   - fix a !CONFIG_NUMA_BALANCING bug

   - fix a kerneldoc warning"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/fair: Fix nuisance kernel-doc warning
  sched/cpuset/pm: Fix cpuset vs. suspend-resume bugs
  sched/fair: Fix wake_affine_llc() balancing rules
kernel/cgroup/cpuset.c
kernel/sched/fair.c