Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

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

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 7907586c6e08e4d3b48b4d1b6f2ccf95d54224e4..1135996bec8b0465300c2935d3c40ee8593537fd 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -356,17 +356,6 @@ Who:       Hans de Goede <hdegoede@redhat.com>
 
 ---------------------------
 
-What:  SELinux "compat_net" functionality
-When:  2.6.30 at the earliest
-Why:   In 2.6.18 the Secmark concept was introduced to replace the "compat_net"
-       network access control functionality of SELinux.  Secmark offers both
-       better performance and greater flexibility than the "compat_net"
-       mechanism.  Now that the major Linux distributions have moved to
-       Secmark, it is time to deprecate the older mechanism and start the
-       process of removing the old code.
-Who:   Paul Moore <paul.moore@hp.com>
----------------------------
-
 What:  sysfs ui for changing p4-clockmod parameters
 When:  September 2009
 Why:   See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and