diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-09 00:35:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-09 00:35:12 -0400 |
| commit | 92c1d6522135050cb377a18cc6e30d08dfb87efb (patch) | |
| tree | 5d2fa3051c975f1c459b6949f9e71cac2edf74de /block | |
| parent | df2a40f549e6b73aad98b0c03f400c00d284816b (diff) | |
| parent | 99c8b231ae6c6ca4ca2fd1c0b3701071f589661f (diff) | |
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()
Diffstat (limited to 'block')
| -rw-r--r-- | block/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/Kconfig b/block/Kconfig index 2466dcc3ef1d..56cb1695cd87 100644 --- a/block/Kconfig +++ b/block/Kconfig | |||
| @@ -89,7 +89,7 @@ config BLK_DEV_THROTTLING | |||
| 89 | one needs to mount and use blkio cgroup controller for creating | 89 | one needs to mount and use blkio cgroup controller for creating |
| 90 | cgroups and specifying per device IO rate policies. | 90 | cgroups and specifying per device IO rate policies. |
| 91 | 91 | ||
| 92 | See Documentation/cgroup-v1/blkio-controller.txt for more information. | 92 | See Documentation/cgroup-v1/blkio-controller.rst for more information. |
| 93 | 93 | ||
| 94 | config BLK_DEV_THROTTLING_LOW | 94 | config BLK_DEV_THROTTLING_LOW |
| 95 | bool "Block throttling .low limit interface support (EXPERIMENTAL)" | 95 | bool "Block throttling .low limit interface support (EXPERIMENTAL)" |