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 /Documentation/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 'Documentation/block')
| -rw-r--r-- | Documentation/block/bfq-iosched.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/block/bfq-iosched.txt b/Documentation/block/bfq-iosched.txt index 1a0f2ac02eb6..b2265cf6c9c3 100644 --- a/Documentation/block/bfq-iosched.txt +++ b/Documentation/block/bfq-iosched.txt | |||
| @@ -539,7 +539,7 @@ As for cgroups-v1 (blkio controller), the exact set of stat files | |||
| 539 | created, and kept up-to-date by bfq, depends on whether | 539 | created, and kept up-to-date by bfq, depends on whether |
| 540 | CONFIG_DEBUG_BLK_CGROUP is set. If it is set, then bfq creates all | 540 | CONFIG_DEBUG_BLK_CGROUP is set. If it is set, then bfq creates all |
| 541 | the stat files documented in | 541 | the stat files documented in |
| 542 | Documentation/cgroup-v1/blkio-controller.txt. If, instead, | 542 | Documentation/cgroup-v1/blkio-controller.rst. If, instead, |
| 543 | CONFIG_DEBUG_BLK_CGROUP is not set, then bfq creates only the files | 543 | CONFIG_DEBUG_BLK_CGROUP is not set, then bfq creates only the files |
| 544 | blkio.bfq.io_service_bytes | 544 | blkio.bfq.io_service_bytes |
| 545 | blkio.bfq.io_service_bytes_recursive | 545 | blkio.bfq.io_service_bytes_recursive |