Merge branch 'linus' into x86/urgent

[linux-beck.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index bc693fffabe08d1fcd06ba14747b2017556e14ed..f613df8ec7bf732b8fdb36e28b15b519d01d56ec 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -6,6 +6,21 @@ be removed from this file.
 
 ---------------------------
 
+What:  USER_SCHED
+When:  2.6.34
+
+Why:   USER_SCHED was implemented as a proof of concept for group scheduling.
+       The effect of USER_SCHED can already be achieved from userspace with
+       the help of libcgroup. The removal of USER_SCHED will also simplify
+       the scheduler code with the removal of one major ifdef. There are also
+       issues USER_SCHED has with USER_NS. A decision was taken not to fix
+       those and instead remove USER_SCHED. Also new group scheduling
+       features will not be implemented for USER_SCHED.
+
+Who:   Dhaval Giani <dhaval@linux.vnet.ibm.com>
+
+---------------------------
+
 What:  PRISM54
 When:  2.6.34