linux-next: manual merge of the lblnet tree with Linus' tree

linux-next: manual merge of the lblnet tree with Linus' tree

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the lblnet tree got a conflict in
Documentation/feature-removal-schedule.txt between commit
753b7aea8e4611433c13ac157f944d8b4bf42482 ("[CPUFREQ] Add p4-clockmod
sysfs-ui removal to feature-removal schedule") from Linus' tree and
commit 4c7098cc3b1ccf2930bfb866e108e6cd10f4b2f3 ("selinux: Remove the
"compat_net" compatibility code") from the lblnet tree.

Just overlapping additions/removal.  I fixed it up (see below) and can
carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc Documentation/feature-removal-schedule.txt
index 72da982,d6b6dc07..0000000
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -333,24 -323,3 +333,13 @@@ When:	June 200
  Why:	Deprecated by the new fschmd driver.
  Who:	Hans de Goede <hdegoede@redhat.com>
  	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>
- ---------------------------
- 
 +What:	sysfs ui for changing p4-clockmod parameters
 +When:	September 2009
 +Why:	See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and
 +	e088e4c9cdb618675874becb91b2fd581ee707e6.
 +	Removal is subject to fixing any remaining bugs in ACPI which may
 +	cause the thermal throttling not to happen at the right time.
 +Who:	Dave Jones <davej@redhat.com>, Matthew Garrett <mjg@redhat.com>

Re: linux-next: manual merge of the lblnet tree with Linus' tree

[Paul Moore]

On Tuesday 10 March 2009 02:13:34 am Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the lblnet tree got a conflict in
> Documentation/feature-removal-schedule.txt between commit
> 753b7aea8e4611433c13ac157f944d8b4bf42482 ("[CPUFREQ] Add p4-clockmod
> sysfs-ui removal to feature-removal schedule") from Linus' tree and
> commit 4c7098cc3b1ccf2930bfb866e108e6cd10f4b2f3 ("selinux: Remove the
> "compat_net" compatibility code") from the lblnet tree.
>
> Just overlapping additions/removal.  I fixed it up (see below) and can
> carry the fix for a while.

Thanks Stephen, I just updated the lblnet tree so there should be no conflict 
here come tomorrow.

-- 
paul moore
linux @ hp

Re: linux-next: manual merge of the lblnet tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

Hi Paul,

On Tue, 10 Mar 2009 11:00:36 -0400 Paul Moore <paul.moore@hp.com> wrote:
>
> Thanks Stephen, I just updated the lblnet tree so there should be no conflict 
> here come tomorrow.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]