From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paul Moore <paul.moore@hp•com>
Cc: linux-next@vger•kernel.org, Hans de Goede <hdegoede@redhat•com>,
Jean Delvare <khali@linux-fr•org>
Subject: linux-next: manual merge of the lblnet tree
Date: Mon, 8 Dec 2008 18:49:57 +1100 [thread overview]
Message-ID: <20081208184957.ae6f1726.sfr@canb.auug.org.au> (raw)
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@canb•auug.org.au
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@linux-fr•org
---------------------------
+What: fscher and fscpos drivers
+When: June 2009
+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>
next reply other threads:[~2008-12-08 7:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-08 7:49 Stephen Rothwell [this message]
2008-12-08 19:38 ` linux-next: manual merge of the lblnet tree Paul Moore
2008-12-08 20:19 ` Jean Delvare
2008-12-09 0:23 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-12-08 8:07 Stephen Rothwell
2008-12-08 10:46 ` David Howells
2008-12-08 16:09 ` Casey Schaufler
2008-12-08 19:41 ` Paul Moore
2008-12-08 21:16 ` James Morris
2008-12-08 22:58 ` Paul Moore
2008-12-09 4:15 ` Casey Schaufler
2008-12-10 17:05 ` Casey Schaufler
2008-12-10 17:34 ` Paul Moore
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081208184957.ae6f1726.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hdegoede@redhat$(echo .)com \
--cc=khali@linux-fr$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paul.moore@hp$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox