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)
commit92c1d6522135050cb377a18cc6e30d08dfb87efb
tree5d2fa3051c975f1c459b6949f9e71cac2edf74de
parentdf2a40f549e6b73aad98b0c03f400c00d284816b
parent99c8b231ae6c6ca4ca2fd1c0b3701071f589661f
Merge branch 'for-5.3' of git://git./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