]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jul 2019 04:35:12 +0000 (21:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jul 2019 04:35:12 +0000 (21:35 -0700)
commit5c51940114f0c252206a18778c1d60b78457b875
tree5d2fa3051c975f1c459b6949f9e71cac2edf74de
parent2206d75c9c521c96bae1979c540ab66f43e34993
parentbd32f926bdaf177fcc462246d3b8ab83c65167a3
Merge branch 'for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

Pull cgroup updates from Tejun Heo:
 "Documentation updates and the addition of cgroup_parse_float() which
  will be used by new controllers including blk-iocost"

* 'for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  docs: cgroup-v1: convert docs to ReST and rename to *.rst
  cgroup: Move cgroup_parse_float() implementation out of CONFIG_SYSFS
  cgroup: add cgroup_parse_float()
Documentation/admin-guide/cgroup-v2.rst
Documentation/admin-guide/kernel-parameters.txt
Documentation/cgroup-v1/blkio-controller.rst
MAINTAINERS
block/Kconfig
include/linux/cgroup-defs.h
include/uapi/linux/bpf.h
init/Kconfig
kernel/cgroup/cgroup.c
kernel/cgroup/cpuset.c
tools/include/uapi/linux/bpf.h