---

yaml --- r: 273737 b: refs/heads/master c: 5fe69d7 h: refs/heads/master i: 273735: cd4202c v: v3
git-mirror · Nov 4, 2011 · f3a1548 · f3a1548
1 parent 7100099
commit f3a1548
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dee119b1fa672d65f34f86fe5cefa81d71ed040e
+refs/heads/master: 5fe69d7e258a17d825d982ac695c1db5c4bc4768
diff --git a/trunk/Documentation/cgroups/cgroups.txt b/trunk/Documentation/cgroups/cgroups.txt
@@ -454,8 +454,8 @@ mounted hierarchy, to remove a task from its current cgroup you must
 move it into a new cgroup (possibly the root cgroup) by writing to the
 new cgroup's tasks file.
 
-Note: If the ns cgroup is active, moving a process to another cgroup can
-fail.
+Note: Due to some restrictions enforced by some cgroup subsystems, moving
+a process to another cgroup can fail.
 
 2.3 Mounting hierarchies by name
 --------------------------------