X-Git-Url: https://git.decadent.org.uk/gitweb/?p=debian-kernel-talk.git;a=blobdiff_plain;f=index.html;h=4c0af612a21ebfbb94a553305b68ba720f43b2cd;hp=87218ad26b85ddcbf6c19df55f1e62a0c25dce9e;hb=dd646eeaf124aaab897bf9199bc0878fa69ce928;hpb=ffda40203fa56e4f73c98eb7746dfcf1fa53d87a

diff --git a/index.html b/index.html
index 87218ad..4c0af61 100644
--- a/index.html
+++ b/index.html
@@ -4,11 +4,11 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<title>The Linux kernel in Debian - Ben Hutchings - DebConf 11</title>
+<title>The Linux kernel in Debian - Mini-DebConf Paris 2012</title>
 <!-- metadata -->
 <meta name="generator" content="S5" />
 <meta name="version" content="S5 1.1" />
-<meta name="author" content="Ben Hutchings" />
+<meta name="author" content="Ben Hutchings, Max Attems" />
 <!-- configuration parameters -->
 <meta name="defaultView" content="slideshow" />
 <meta name="controlVis" content="hidden" />
@@ -37,10 +37,9 @@
 <div id="controls"><!-- DO NOT EDIT --></div>
 <div id="currentSlide"><!-- DO NOT EDIT --></div>
 <div id="header">
-  <object class="logo" data="debconf11.svg"></object>
 </div>
 <div id="footer">
-<h1>DebConf 11</h1>
+<h1>Mini-DebConf Paris 2012</h1>
 <h2>The Linux kernel in Debian</h2>
 </div>
 
@@ -51,12 +50,12 @@
 <div class="slide">
 <h1>The Linux kernel in Debian</h1>
 <object data="tux-debian.svg" width="35%" align="right"></object>
-<h3>Ben Hutchings</h3>
+<h3>Ben Hutchings and Max Attems</h3>
 </div>
 
 <div class="slide">
-  <h1>The author</h1>
-  <ul class="incremental">
+  <h1>Ben Hutchings</h1>
+  <ul>
     <li>
       Professional software developer since 1998
     </li>
@@ -74,7 +73,7 @@
     </li>
     <li>
       Debian kernel contributor since 2008; uploader since 2009
-      <ul class="incremental">
+      <ul>
 	<li>
 	  Initially trying to deal with the non-free firmware issue
 	</li>
@@ -87,6 +86,13 @@
   </ul>
 </div>
 
+<div class="slide">
+  <h1>Max Attems</h1>
+  <ul>
+    <li>TODO</li>
+  </ul>
+</div>
+
 <div class="slide">
   <h1>Linux kernel</h1>
   <ul class="incremental">
@@ -181,7 +187,7 @@
   <ul class="incremental">
     <li>
       Currently 5 general maintainers: Maximilian Attems, Bastian
-      Blank, dann frazier, Moritz Muehlenhoff and me
+      Blank, dann frazier, Ben Hutchings, Moritz Muehlenhoff
     </li>
     <li>
       Many more specialised contributors:
@@ -302,7 +308,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 +346,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>
@@ -386,7 +421,7 @@
     </li>
     <li>
       Also collected in linux-firmware.git repository maintained by
-      David Woodhouse and myself
+      David Woodhouse and Ben Hutchings
     </li>
   </ul>
 </div>
@@ -430,7 +465,7 @@
 Redistribution is free but has to include this notice.
       -->
       <ul>
-	<li>Modified by me to add Debian open-ND logo</li>
+	<li>Modified by Ben to add Debian open-ND logo</li>
       </ul>
     </li>
     <li>
@@ -456,33 +491,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.
       -->
     </li>
-    <li>
-      DebConf 11 logo &copy; Aur&eacute;lio A. Heckert.
-      <!--
-This program is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public
-License as published by the Free Software Foundation;
-version 2 of the License.
-
-This program is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU General Public License for more
-details.
-
-You should have received a copy of the GNU General Public
-License along with this package; if not, write to the Free
-Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-Boston, MA  02110-1301 USA
-
-On Debian systems, the full text of the GNU General Public
-License version 2 can be found in the file
-`/usr/share/common-licenses/GPL-2'.
-      -->
-      <ul>
-	<li>Resized and coloured by me</li>
-      </ul>
-    </li>
   </ul>
 </div>
 
