diff options
author | 2017-04-16 11:48:10 -0700 | |
---|---|---|
committer | 2017-04-16 11:48:10 -0700 | |
commit | 11c994d9a50b6ba5a96a1c1450ce0fa7bd840f1c (patch) | |
tree | 33f5a45684872ea1ba4a23ad3d2eccb0f771687c /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge tag 'tty-4.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty (diff) | |
parent | Revert "cgroup: avoid attaching a cgroup root to two different superblocks" (diff) | |
download | linux-rng-11c994d9a50b6ba5a96a1c1450ce0fa7bd840f1c.tar.xz linux-rng-11c994d9a50b6ba5a96a1c1450ce0fa7bd840f1c.zip |
Merge branch 'for-4.11-fixes' of git://git.kernel.org/pub/scm/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"
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions