diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-13 12:25:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-13 12:25:42 -0800 |
| commit | ac30d8ce28d61c05ac3a8b1452e889371136f3af (patch) | |
| tree | 3d6b932ffafc4a34c214b52c3a7a7542d4e55dd6 /MAINTAINERS | |
| parent | 25cbda46779418e5ae435707675a312c99a16dff (diff) | |
| parent | 74bdd45c85d02f695a1cd1c3dccf8b3960a86d8f (diff) | |
| download | linux-stable-ac30d8ce28d61c05ac3a8b1452e889371136f3af.tar.gz linux-stable-ac30d8ce28d61c05ac3a8b1452e889371136f3af.tar.bz2 linux-stable-ac30d8ce28d61c05ac3a8b1452e889371136f3af.zip | |
Merge branch 'for-5.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fixes from Tejun Heo:
"Two cgroup fixes:
- fix a NULL deref when trying to poll PSI in the root cgroup
- fix confusing controller parsing corner case when mounting cgroup
v1 hierarchies
And doc / maintainer file updates"
* 'for-5.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: update PSI file description in docs
cgroup: fix psi monitor for root cgroup
MAINTAINERS: Update my email address
MAINTAINERS: Remove stale URLs for cpuset
cgroup-v1: add disabled controller check in cgroup1_parse_param()
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e9fccfb27e2d..bfc1b86e3e73 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4468,7 +4468,7 @@ F: include/linux/console* CONTROL GROUP (CGROUP) M: Tejun Heo <tj@kernel.org> -M: Li Zefan <lizefan@huawei.com> +M: Zefan Li <lizefan.x@bytedance.com> M: Johannes Weiner <hannes@cmpxchg.org> L: cgroups@vger.kernel.org S: Maintained @@ -4492,11 +4492,9 @@ F: block/blk-throttle.c F: include/linux/blk-cgroup.h CONTROL GROUP - CPUSET -M: Li Zefan <lizefan@huawei.com> +M: Zefan Li <lizefan.x@bytedance.com> L: cgroups@vger.kernel.org S: Maintained -W: http://www.bullopensource.org/cpuset/ -W: http://oss.sgi.com/projects/cpusets/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git F: Documentation/admin-guide/cgroup-v1/cpusets.rst F: include/linux/cpuset.h |