X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=index.html;h=7752d478ef551d48b92b731d2ee7f6035ac87a31;hb=3c80807da28173e52f54f60665adce9571db11d2;hp=87218ad26b85ddcbf6c19df55f1e62a0c25dce9e;hpb=ffda40203fa56e4f73c98eb7746dfcf1fa53d87a;p=debian-kernel-talk.git
diff --git a/index.html b/index.html
index 87218ad..7752d47 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
-The Linux kernel in Debian - Ben Hutchings - DebConf 11
+The Linux kernel in Debian - Ben Hutchings - Mini-DebConf Paris 2012
@@ -37,10 +37,9 @@
@@ -302,7 +301,7 @@
linux-kbuild-2.6 builds
linux-kbuild-upstream -
- code used for building OOT modules
+ kernel build system and tools for building OOT modules
@@ -340,6 +339,35 @@
+
+
Extra features
+
+ Always aim to get patches merged upstream. But many big features
+ that users want added are not merged upstream for a long
+ time. Kernel team expects features to be upstream first, then
+ backported.
+
+
+ But there have been exceptions:
+
+
+ -
+ OpenVZ and VServer - mostly reimplemented with cgroups and
+ namespaces
+
+ -
+ Xen - now upstream; Linux 3.0 is a useful dom0 kernel!
+
+ -
+ aufs - needed for Debian Live
+
+ -
+ PREEMPT_RT - gradually being merged upstream; new option in
+ amd64 packages
+
+
+
+
Out-of-tree modules
@@ -456,33 +484,6 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-->
-
- DebConf 11 logo © Aurélio A. Heckert.
-
-
- - Resized and coloured by me
-
-