From 0fb1547b341ccf0d8156ffd92a856337d2395255 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 28 Jul 2011 23:32:07 +0200
Subject: [PATCH] Add another slide about extra features

---
 index.html | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

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>
-- 
2.39.2