diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-09 19:07:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-09 19:07:45 -0800 |
| commit | 15763db134dd60504dbd93137e6654f06d639acf (patch) | |
| tree | 029202adc2faf44a84f5c9454fe0073094b06d0d /Documentation | |
| parent | c2189e3a3d67e94941c568ee8fab1b86983cd024 (diff) | |
| parent | f3ba53802eff25e3eedb60d7afe5262710e20bd5 (diff) | |
Merge branch 'for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup changes from Tejun Heo:
"Three mostly trivial patches. The biggest change is that blkio is now
initialized before memcg which will be needed to make memcg and blkcg
cooperate on writeback IOs"
* 'for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: add dummy css_put() for !CONFIG_CGROUPS
cgroup: reorder SUBSYS(blkio) in cgroup_subsys.h
Update of Documentation/cgroups/00-INDEX
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/cgroups/00-INDEX | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/cgroups/00-INDEX b/Documentation/cgroups/00-INDEX index bc461b6425a7..96ce071a3633 100644 --- a/Documentation/cgroups/00-INDEX +++ b/Documentation/cgroups/00-INDEX @@ -24,3 +24,5 @@ net_prio.txt - Network priority cgroups details and usages. resource_counter.txt - Resource Counter API. +unified-hierarchy.txt + - Description the new/next cgroup interface. |