diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-07 20:20:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-07 20:20:16 -0700 |
| commit | d030671f3f261e528dc6e396a13f10859a74ae7c (patch) | |
| tree | 250063e9ed52596a8006a594ebf2efe84261cc7b /net/l2tp | |
| parent | 6a5c75ce10cbfc805a4e6305638d6329a3beb77a (diff) | |
| parent | aa32362f011c6e863132b16c1761487166a4bad2 (diff) | |
Merge branch 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fixes from Tejun Heo:
"This pull request includes Alban's patch to disallow '\n' in cgroup
names.
Two other patches from Li to fix a possible oops when cgroup
destruction races against other file operations and one from Vivek to
fix a unified hierarchy devel behavior"
* 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: check cgroup liveliness before unbreaking kernfs
cgroup: delay the clearing of cgrp->kn->priv
cgroup: Display legacy cgroup files on default hierarchy
cgroup: reject cgroup names with '\n'
Diffstat (limited to 'net/l2tp')
0 files changed, 0 insertions, 0 deletions