diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-02 17:04:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-02 17:04:23 +0200 |
| commit | 8bdc69b764013a9b5ebeef7df8f314f1066c5d79 (patch) | |
| tree | 335dcb29c9ba06142917121d551575d360eca63e /net/netrom/sysctl_net_netrom.c | |
| parent | Merge branch 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/pe... (diff) | |
| parent | Merge branch 'for-4.3-unified-base' into for-4.3 (diff) | |
| download | linux-8bdc69b764013a9b5ebeef7df8f314f1066c5d79.tar.xz linux-8bdc69b764013a9b5ebeef7df8f314f1066c5d79.zip | |
Merge branch 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo:
- a new PIDs controller is added. It turns out that PIDs are actually
an independent resource from kmem due to the limited PID space.
- more core preparations for the v2 interface. Once cpu side interface
is settled, it should be ready for lifting the devel mask.
for-4.3-unified-base was temporarily branched so that other trees
(block) can pull cgroup core changes that blkcg changes depend on.
- a non-critical idr_preload usage bug fix.
* 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: pids: fix invalid get/put usage
cgroup: introduce cgroup_subsys->legacy_name
cgroup: don't print subsystems for the default hierarchy
cgroup: make cftype->private a unsigned long
cgroup: export cgrp_dfl_root
cgroup: define controller file conventions
cgroup: fix idr_preload usage
cgroup: add documentation for the PIDs controller
cgroup: implement the PIDs subsystem
cgroup: allow a cgroup subsystem to reject a fork
Diffstat (limited to 'net/netrom/sysctl_net_netrom.c')
0 files changed, 0 insertions, 0 deletions