Merge branch 'for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jun 2020 16:59:34 +0000 (09:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jun 2020 16:59:34 +0000 (09:59 -0700)
commit4a7e89c5ec0238017a757131eb9ab8dc111f961c
tree17b7e40564d50e1d813371055bc3b2a668ceffc2
parent3c0ad98c2eda5ff30d23777e30744be6f7b8f097
parent936f2a70f2077f64fab1dcb3eca71879e82ecd3f
Merge branch 'for-5.8' of git://git./linux/kernel/git/tj/cgroup

Pull cgroup updates from Tejun Heo:
 "Just two patches: one to add system-level cpu.stat to the root cgroup
  for convenience and a trivial comment update"

* 'for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: add cpu.stat file to root cgroup
  cgroup: Remove stale comments
Documentation/admin-guide/cgroup-v2.rst
kernel/cgroup/cgroup.c