diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-20 13:31:04 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-20 13:31:04 +1100 |
| commit | e6e8f8272eebacc82b103fbd7f0b99764181fef5 (patch) | |
| tree | 25e050ea17b5ab830b95d53847c068d341305543 /Documentation | |
| parent | 7ad4712c85d0b48a9961168259374751cdfed6e6 (diff) | |
| parent | 5ac59423dd99cc10e8bdf31e7dbb4ff3070308b9 (diff) | |
Merge commit 'lblnet/master'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 11 | ||||
| -rw-r--r-- | Documentation/kernel-parameters.txt | 9 |
2 files changed, 0 insertions, 20 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index dc415ca3d358..78b13fa7897f 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -321,17 +321,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 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 07ce4441ec74..114e162994fe 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -2017,15 +2017,6 @@ and is between 256 and 4096 characters. It is defined in the file If enabled at boot time, /selinux/disable can be used later to disable prior to initial policy load. - selinux_compat_net = - [SELINUX] Set initial selinux_compat_net flag value. - Format: { "0" | "1" } - 0 -- use new secmark-based packet controls - 1 -- use legacy packet controls - Default value is 0 (preferred). - Value can be changed at runtime via - /selinux/compat_net. - serialnumber [BUGS=X86-32] shapers= [NET] |