summaryrefslogtreecommitdiffstats
path: root/Documentation/feature-removal-schedule.txt
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-07-05 07:35:09 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-05 07:35:09 -0700
commit0c9e98af5e94877ad3b1af2c0f39b2376a462ded (patch)
treeacbab68f802fadbff85590c139c87dc199bb465d /Documentation/feature-removal-schedule.txt
parentaf0c25c4876305dfa1a25ac1cc92d3cddfa476a6 (diff)
parentfe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff)
downloadlinux-0c9e98af5e94877ad3b1af2c0f39b2376a462ded.tar.gz
linux-0c9e98af5e94877ad3b1af2c0f39b2376a462ded.tar.bz2
linux-0c9e98af5e94877ad3b1af2c0f39b2376a462ded.zip
Merge Linux 3.0-rc6 into staging-next
This handles the merge conflicts with the drivers/staging/brcm80211/Kconfig file due to changes on the two different branches. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
-rw-r--r--Documentation/feature-removal-schedule.txt17
1 files changed, 0 insertions, 17 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 15545d4fcab2..6257186b5869 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -467,23 +467,6 @@ Who: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
----------------------------
-What: namespace cgroup (ns_cgroup)
-When: 2.6.38
-Why: The ns_cgroup leads to some problems:
- * cgroup creation is out-of-control
- * cgroup name can conflict when pids are looping
- * it is not possible to have a single process handling
- a lot of namespaces without falling in a exponential creation time
- * we may want to create a namespace without creating a cgroup
-
- The ns_cgroup is replaced by a compatibility flag 'clone_children',
- where a newly created cgroup will copy the parent cgroup values.
- The userspace has to manually create a cgroup and add a task to
- the 'tasks' file.
-Who: Daniel Lezcano <daniel.lezcano@free.fr>
-
-----------------------------
-
What: iwlwifi disable_hw_scan module parameters
When: 2.6.40
Why: Hareware scan is the prefer method for iwlwifi devices for