diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-29 14:29:04 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-29 14:29:04 -0700 |
commit | 574c7e233344b58c6b14b305c93de361d3e7d35d (patch) | |
tree | 88cd36a4fb1401fe408c68f717e8b932fb71371d /security/smack/smack_lsm.c | |
parent | Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | cgroupns: Only allow creation of hierarchies in the initial cgroup namespace (diff) | |
download | linux-dev-574c7e233344b58c6b14b305c93de361d3e7d35d.tar.xz linux-dev-574c7e233344b58c6b14b305c93de361d3e7d35d.zip |
Merge branch 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull more cgroup updates from Tejun Heo:
"I forgot to include the patches which got applied to for-4.7-fixes
late during last cycle.
Eric's three patches fix bugs introduced with the namespace support"
* 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroupns: Only allow creation of hierarchies in the initial cgroup namespace
cgroupns: Close race between cgroup_post_fork and copy_cgroup_ns
cgroupns: Fix the locking in copy_cgroup_ns
Diffstat (limited to 'security/smack/smack_lsm.c')
0 files changed, 0 insertions, 0 deletions