[GIT PULL] cgroup fixes for v5.11-rc7

[GIT PULL] cgroup fixes for v5.11-rc7

[Tejun Heo]

Hello, Linus.

Two cgroup fixes: 1. Fix the NULL deref when trying to poll PSI in the root
cgroup and 2. fix confusing controller parsing corner case when mounting
cgroup v1 hierarchies. And doc / maintainer file updates.

Thanks.

The following changes since commit f4e087c666f54559cb4e530af1fbfc9967e14a15:

  Merge tag 'acpi-5.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (2021-01-15 10:55:33 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git for-5.11-fixes

for you to fetch changes up to 74bdd45c85d02f695a1cd1c3dccf8b3960a86d8f:

  cgroup: update PSI file description in docs (2021-01-19 12:03:07 -0500)

----------------------------------------------------------------
Chen Zhou (1):
      cgroup-v1: add disabled controller check in cgroup1_parse_param()

Odin Ugedal (2):
      cgroup: fix psi monitor for root cgroup
      cgroup: update PSI file description in docs

Zefan Li (2):
      MAINTAINERS: Remove stale URLs for cpuset
      MAINTAINERS: Update my email address

 Documentation/admin-guide/cgroup-v2.rst | 6 +++---
 MAINTAINERS                             | 6 ++----
 kernel/cgroup/cgroup-v1.c               | 3 +++
 kernel/cgroup/cgroup.c                  | 4 +++-
 4 files changed, 11 insertions(+), 8 deletions(-)

-- 
tejun

Re: [GIT PULL] cgroup fixes for v5.11-rc7

[pr-tracker-bot]

The pull request you sent on Sat, 13 Feb 2021 15:03:31 -0500:

> git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git for-5.11-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/ac30d8ce28d61c05ac3a8b1452e889371136f3af

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html