diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-01 13:52:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-01 13:52:24 -0700 |
commit | 9410091dd5b4097819fcbb6d63987c51f62c85fd (patch) | |
tree | 9144c17f764008b27022d6350fd19d4c1e785d43 /fs | |
parent | ad1490bcd2484a24f5b8d7ae18368b739f3e1e19 (diff) | |
parent | 310b4816a5d8082416b4ab83e5a7b3cb92883a4d (diff) | |
download | linux-9410091dd5b4097819fcbb6d63987c51f62c85fd.tar.bz2 |
Merge branch 'for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo:
"Nothing major. Two notable fixes are Li's second stab at fixing the
long-standing race condition in the mount path and suppression of
spurious warning from cgroup_get(). All other changes are trivial"
* 'for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: mark cgroup_get() with __maybe_unused
cgroup: avoid attaching a cgroup root to two different superblocks, take 2
cgroup: fix spurious warnings on cgroup_is_dead() from cgroup_sk_alloc()
cgroup: move cgroup_subsys_state parent field for cache locality
cpuset: Remove cpuset_update_active_cpus()'s parameter.
cgroup: switch to BUG_ON()
cgroup: drop duplicate header nsproxy.h
kernel: convert css_set.refcount from atomic_t to refcount_t
kernel: convert cgroup_namespace.count from atomic_t to refcount_t
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions