X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=index.html;h=6c5fe7be8cb93dede2c2b27644fa83263e47e8c8;hb=refs%2Ftags%2Fdebconf11;hp=87218ad26b85ddcbf6c19df55f1e62a0c25dce9e;hpb=ffda40203fa56e4f73c98eb7746dfcf1fa53d87a;p=debian-kernel-talk.git

diff --git a/index.html b/index.html
index 87218ad..6c5fe7b 100644
--- a/index.html
+++ b/index.html
@@ -302,7 +302,7 @@
     <li>
       <span class="package">linux-kbuild-2.6</span> builds
       <span class="package">linux-kbuild-<var>upstream</var></span> -
-      code used for building OOT modules
+      kernel build system and tools for building OOT modules
     </li>
   </ul>
 </div>
@@ -340,6 +340,35 @@
   </ul>
 </div>
 
+<div class="slide">
+  <h1>Extra features</h1>
+  <p>
+    Always aim to get patches merged upstream.  But many big features
+    that users want added are <em>not</em> merged upstream for a long
+    time.  Kernel team expects features to be upstream first, then
+    backported.
+  </p>
+  <p class="incremental">
+    But there have been exceptions:
+  </p>
+  <ul class="incremental">
+    <li>
+      OpenVZ and VServer - mostly reimplemented with cgroups and
+      namespaces
+    </li>
+    <li>
+      Xen - now upstream; Linux 3.0 is a useful dom0 kernel!
+    </li>
+    <li>
+      aufs - needed for Debian Live
+    </li>
+    <li>
+      PREEMPT_RT - gradually being merged upstream; new option in
+      amd64 packages
+    </li>
+  </ul>
+</div>
+
 <div class="slide">
   <h1>Out-of-tree modules</h1>
   <p>