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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #3]
  Revert "CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #2]"
  SELinux: shrink sizeof av_inhert selinux_class_perm and context
  CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #2]
  keys: fix sparse warning by adding __user annotation to cast
  smack: Add support for unlabeled network hosts and networks
  selinux: Deprecate and schedule the removal of the the compat_net functionality
  netlabel: Update kernel configuration API

1 files changed, 12 insertions, 0 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index df18d87c4837..2193be53e773 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -315,3 +315,15 @@ When:	2.6.29 (ideally) or 2.6.30 (more likely)
 Why:    Deprecated by the new (standard) device driver binding model. Use
         i2c_driver->probe() and ->remove() instead.
 Who:    Jean Delvare <khali@linux-fr.org>
+
+---------------------------
+
+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>