Hi Paul,
Today's linux-next merge of the lblnet tree got a conflict in
Documentation/feature-removal-schedule.txt between commit
839361440c4cf848dddc5705fa4ac7c25d00dddf ("hwmon: Deprecate the fscher
and fscpos drivers") from the jdelvare-hwmon tree and commit
d45075ffb96a78c0f7137cfcec9fe816a6d23cfb ("selinux: Deprecate and
schedule the removal of the the compat_net functionality") from the
lblnet tree.
Just overlapping additions. I fixed it up (see below) and can carry it
as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc Documentation/feature-removal-schedule.txt
index ba66f38,6ae3e9b..0000000
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -339,8 -346,12 +339,20 @@@ Who: Jean Delvare <khali@xxxxxxxxxxxx
---------------------------
+What: fscher and fscpos drivers
+When: June 2009
+Why: Deprecated by the new fschmd driver.
+Who: Hans de Goede <hdegoede@xxxxxxxxxx>
+ Jean Delvare <khali@xxxxxxxxxxxx>
++
++---------------------------
++
+ 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@xxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
