diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-07 10:11:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-07 10:11:41 -0800 |
| commit | 1fc1cd8399ab5541a488a7e47b2f21537dd76c2d (patch) | |
| tree | 8096fd360f6746e6f7c852a7f070fa1bf6f93266 /MAINTAINERS | |
| parent | abf7c3d8ddea3b43fe758590791878e1fd88ac47 (diff) | |
| parent | 6a613d24effcb875271b8a1c510172e2d6eaaee8 (diff) | |
Merge branch 'for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo:
- Oleg's pids controller accounting update which gets rid of rcu delay
in pids accounting updates
- rstat (cgroup hierarchical stat collection mechanism) optimization
- Doc updates
* 'for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cpuset: remove unused task_has_mempolicy()
cgroup, rstat: Don't flush subtree root unless necessary
cgroup: add documentation for pids.events file
Documentation: cgroup-v2: eliminate markup warnings
MAINTAINERS: Update cgroup entry
cgroup/pids: turn cgroup_subsys->free() into cgroup_subsys->release() to fix the accounting
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index da7470cf3c2b..da98f27cf1b5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3970,9 +3970,10 @@ M: Johannes Weiner <hannes@cmpxchg.org> L: cgroups@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git S: Maintained -F: Documentation/cgroup* +F: Documentation/admin-guide/cgroup-v2.rst +F: Documentation/cgroup-v1/ F: include/linux/cgroup* -F: kernel/cgroup* +F: kernel/cgroup/ CONTROL GROUP - CPUSET M: Li Zefan <lizefan@huawei.com> |