From: Mauro Carvalho Chehab Date: Wed, 9 May 2018 13:18:45 +0000 (-0300) Subject: docs: admin-guide: add cgroup-v2 documentation X-Git-Tag: v4.18-rc1~181^2~17 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b6e9d06789fc37aeac36da41307d1b55a5192778;p=linux.git docs: admin-guide: add cgroup-v2 documentation The cgroup-v2.txt is already in ReST format. So, move it to the admin-guide, where it belongs. Cc: Li Zefan Cc: Johannes Weiner Acked-by: Tejun Heo Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX index a50d2380b6fb..2754fe83f0d4 100644 --- a/Documentation/00-INDEX +++ b/Documentation/00-INDEX @@ -80,8 +80,6 @@ cdrom/ - directory with information on the CD-ROM drivers that Linux has. cgroup-v1/ - cgroups v1 features, including cpusets and memory controller. -cgroup-v2.txt - - cgroups v2 features, including cpusets and memory controller. cma/ - Continuous Memory Area (CMA) debugfs interface. conf.py diff --git a/Documentation/cgroup-v2.txt b/Documentation/admin-guide/cgroup-v2.rst similarity index 100% rename from Documentation/cgroup-v2.txt rename to Documentation/admin-guide/cgroup-v2.rst diff --git a/Documentation/admin-guide/index.rst b/Documentation/admin-guide/index.rst index 52eb3408f9a0..48d70af11652 100644 --- a/Documentation/admin-guide/index.rst +++ b/Documentation/admin-guide/index.rst @@ -48,6 +48,7 @@ configure specific aspects of kernel behavior to your liking. :maxdepth: 1 initrd + cgroup-v2 serial-console braille-console parport