Merge branch 'for-4.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Jun 2017 22:37:03 +0000 (15:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Jun 2017 22:37:03 +0000 (15:37 -0700)
commitba7b2387ad239a519041f2a2d35a1902bdd03dfb
tree76d562693c551a38d1d096fe598f8b9612366256
parente543c8a92fb6eca8dd554561fa55bba5f2a90d09
parent41c25707d21716826e3c1f60967f5550610ec1c9
Merge branch 'for-4.12-fixes' of git://git./linux/kernel/git/tj/cgroup

Pull cgroup fixes from Tejun Heo:
 "Two cgroup fixes. One to address RCU delay of cpuset removal affecting
  userland visible behaviors. The other fixes a race condition between
  controller disable and cgroup removal"

* 'for-4.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cpuset: consider dying css as offline
  cgroup: Prevent kill_css() from being called more than once