Merge branch 'for-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 Apr 2017 18:48:10 +0000 (11:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 Apr 2017 18:48:10 +0000 (11:48 -0700)
commit11c994d9a50b6ba5a96a1c1450ce0fa7bd840f1c
tree33f5a45684872ea1ba4a23ad3d2eccb0f771687c
parent032aaf3f9ff9faa039673d95ea95e02ddff3a26b
parent330c418638612d7658b6314e6a244fcb5f7efac5
Merge branch 'for-4.11-fixes' of git://git./linux/kernel/git/tj/cgroup

Pull cgroup fix from Tejun Heo:
 "Unfortunately, the commit to fix the cgroup mount race in the previous
  pull request can lead to hangs.

  The original bug has been around for a while and isn't too likely to
  be triggered in usual use cases. Revert the commit for now"

* 'for-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  Revert "cgroup: avoid attaching a cgroup root to two different superblocks"