Merge branch 'for-4.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Mar 2018 22:39:02 +0000 (15:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Mar 2018 22:39:02 +0000 (15:39 -0700)
commit1b5f3ba415fe4cf8b8b39c8d104ed44cde330658
tree1a3b4caae227dc92a8dcec4b9868b89f7120fbd8
parentc6256ca9c011db79cca6b7a3a659389ff217e0bd
parentd1897c9538edafd4ae6bbd03cc075962ddde2c21
Merge branch 'for-4.16-fixes' of git://git./linux/kernel/git/tj/cgroup

Pull cgroup fixes from Tejun Heo:
 "Two commits to fix the following subtle cgroup2 behavior bugs:

   - cpu.max was rejecting config when it shouldn't

   - thread mode enable was allowed when it shouldn't"

* 'for-4.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: fix rule checking for threaded mode switching
  sched, cgroup: Don't reject lower cpu.max on ancestors
kernel/sched/core.c