Merge tag 'docs-5.3' of git://git.lwn.net/linux

[linux-2.6-microblaze.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index c88289c..d3ad482 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -787,7 +787,7 @@ menuconfig CGROUPS
          use with process control subsystems such as Cpusets, CFS, memory
          controls or device isolation.
          See
-               - Documentation/scheduler/sched-design-CFS.txt  (CFS)
+               - Documentation/scheduler/sched-design-CFS.rst  (CFS)
                - Documentation/cgroup-v1/ (features for grouping, isolation
                                          and resource control)
 
@@ -850,15 +850,7 @@ config BLK_CGROUP
        CONFIG_CFQ_GROUP_IOSCHED=y; for enabling throttling policy, set
        CONFIG_BLK_DEV_THROTTLING=y.
 
-       See Documentation/cgroup-v1/blkio-controller.txt for more information.
-
-config DEBUG_BLK_CGROUP
-       bool "IO controller debugging"
-       depends on BLK_CGROUP
-       default n
-       ---help---
-       Enable some debugging help. Currently it exports additional stat
-       files in a cgroup which can be useful for debugging.
+       See Documentation/cgroup-v1/blkio-controller.rst for more information.
 
 config CGROUP_WRITEBACK
        bool
@@ -888,7 +880,7 @@ config CFS_BANDWIDTH
          tasks running within the fair group scheduler.  Groups with no limit
          set are considered to be unconstrained and will run with no
          restriction.
-         See Documentation/scheduler/sched-bwc.txt for more information.
+         See Documentation/scheduler/sched-bwc.rst for more information.
 
 config RT_GROUP_SCHED
        bool "Group scheduling for SCHED_RR/FIFO"
@@ -899,7 +891,7 @@ config RT_GROUP_SCHED
          to task groups. If enabled, it will also make it impossible to
          schedule realtime tasks for non-root users until you allocate
          realtime bandwidth for them.
-         See Documentation/scheduler/sched-rt-group.txt for more information.
+         See Documentation/scheduler/sched-rt-group.rst for more information.
 
 endif #CGROUP_SCHED