]> git.baikalelectronics.ru Git - kernel.git/commitdiff
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)
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

1  2 
Documentation/admin-guide/cgroup-v2.rst
kernel/cgroup/cgroup.c

Simple merge