X-Git-Url: https://git.decadent.org.uk/gitweb/?p=debian-kernel-talk.git;a=blobdiff_plain;f=index.html;fp=index.html;h=6c5fe7be8cb93dede2c2b27644fa83263e47e8c8;hp=f481aea5f4de96a57ba6fc2f08e4129040dc9bd6;hb=0fb1547b341ccf0d8156ffd92a856337d2395255;hpb=e20b6148485476aad06340b609ec888106b17167

diff --git a/index.html b/index.html
index f481aea..6c5fe7b 100644
--- a/index.html
+++ b/index.html
@@ -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>