From c12ad58c413272092f080a6c383e3862d787d388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 19 Nov 2017 14:15:42 +0100 Subject: [PATCH] man: remove note about CPU controller being unmerged https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0d5936344f30aba0f6ddb92b030cb6a05168efe6 In principle we shouldn't merge this until after 4.15 is released, but the chances of a revert upstream are low, and in that unlikely scenario we can just revert this patch, it's a trivial documentation update after all. --- man/systemd.resource-control.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml index 9bf2d7e774..72130672cb 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -120,10 +120,6 @@ - Due to the lack of consensus in the kernel community, the CPU controller support on the unified - control group hierarchy requires out-of-tree kernel patches. See cgroup-v2-cpu.txt. - CPUWeight= and StartupCPUWeight= replace CPUShares= and StartupCPUShares=, respectively. @@ -142,7 +138,7 @@ - IO prefixed settings are superset of and replace BlockIO + IO prefixed settings are a superset of and replace BlockIO prefixed ones. On unified hierarchy, IO resource control also applies to buffered writes.