From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Feb 2021 20:25:42 +0000 (-0800)
Subject: Merge branch 'for-5.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ac30d8ce28d61c05ac3a8b1452e889371136f3af;p=linux.git

Merge branch 'for-5.11-fixes' of git://git./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()
---

ac30d8ce28d61c05ac3a8b1452e889371136f3af