Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.cz>2011-11-10 17:28:09 +0100
committerMichal Hocko <mhocko@suse.cz>2011-11-10 17:28:46 +0100
commit3cea58bf2f72add9404592cd759be44c5dac3444 (patch)
tree18460bf9a812748ce1e5abcb74034f9ea321d811
parentf5db5528e30a24958ab50306259aeac79f6b1fd5 (diff)
- patches.fixes/Documentation-update-cgroups-notes.patch:rpm-3.0.8-0.11
Documentation: update cgroups notes (bnc#724133).
-rw-r--r--kernel-source.changes6
-rw-r--r--patches.fixes/Documentation-update-cgroups-notes.patch39
-rw-r--r--series.conf1
3 files changed, 46 insertions, 0 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 117f01e0e4..9ba4e34556 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Nov 10 17:28:06 CET 2011 - mhocko@suse.cz
+
+- patches.fixes/Documentation-update-cgroups-notes.patch:
+ Documentation: update cgroups notes (bnc#724133).
+
+-------------------------------------------------------------------
Thu Nov 10 17:20:16 CET 2011 - hare@suse.de
- patches.fixes/dm-mpath-reset-map_pointer-on-requeue: dm-mpath:
diff --git a/patches.fixes/Documentation-update-cgroups-notes.patch b/patches.fixes/Documentation-update-cgroups-notes.patch
new file mode 100644
index 0000000000..413e8fd7ea
--- /dev/null
+++ b/patches.fixes/Documentation-update-cgroups-notes.patch
@@ -0,0 +1,39 @@
+From 5fe69d7e258a17d825d982ac695c1db5c4bc4768 Mon Sep 17 00:00:00 2001
+From: Li Zefan <lizf@cn.fujitsu.com>
+Date: Fri, 4 Nov 2011 11:22:05 -0700
+Subject: [PATCH] Documentation: update cgroups notes
+Patch-mainline: v3.2-rc1
+Git-commit: 5fe69d7e258a17d825d982ac695c1db5c4bc4768
+References: bnc#724133
+
+- ns cgroup has been removed.
+- it's true moving a task to another cgroup can fail.
+
+Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
+Acked-by: Paul Menage <paul@paulmenage.org>
+Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Acked-by: Michal Hocko <mhocko@suse.cz>
+
+---
+ Documentation/cgroups/cgroups.txt | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt
+index cd67e90..9c452ef 100644
+--- a/Documentation/cgroups/cgroups.txt
++++ b/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
+ --------------------------------
+--
+1.7.5.4
+
diff --git a/series.conf b/series.conf
index 9d889228d7..e8e4f84d3d 100644
--- a/series.conf
+++ b/series.conf
@@ -664,6 +664,7 @@
patches.suse/connector-read-mostly
patches.suse/kbd-ignore-gfx.patch
patches.fixes/linux-3.0.0-fix-strim.txt
+ patches.fixes/Documentation-update-cgroups-notes.patch
########################################################
#