X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=index.html;fp=index.html;h=824fe940b2e73b520366aea4be156b6358be6b4b;hb=5a1b8eb3329ee5981f437bdfdecdf764a5059879;hp=480752b8a46e562db5a10e5a50dfbc91add8fd71;hpb=d1a814b3c79748dfda13e0948061aa9774cb9759;p=debian-kernel-talk.git

diff --git a/index.html b/index.html
index 480752b..824fe94 100644
--- a/index.html
+++ b/index.html
@@ -172,7 +172,58 @@
 </div>
 
 <div class="slide">
-  <h1>Debian kernel team</h1>
+  <h1>Debian kernel team (1)</h1>
+  <p>
+    Who are we?
+  </p>
+  <ul class="incremental">
+    <li>
+      Currently 5 general maintainers: Maximilian Attems, Bastian
+      Blank, dann frazier, Moritz Muehlenhoff and me
+    </li>
+    <li>
+      Many more specialised contributors:
+      <ul>
+	<li>Specific architectures</li>
+	<li>Specific features (e.g. Xen)</li>
+	<li>Bug triage</li>
+      </ul>
+    </li>
+    <li>
+      Would appreciate more help, particularly with bug triage and
+      PowerPC
+    </li>
+  </ul>
+</div>
+
+<div class="slide">
+  <h1>Debian kernel team (2)</h1>
+  <p>
+    What do we do?
+  </p>
+  <ul class="incremental">
+    <li>
+      Bug triage - takes a huge amount of time
+    </li>
+    <li>
+      Backport bug fixes and features - particularly new hardware
+      support for stable
+      <ul class="incremental">
+	<li>...while trying not to change kernel ABI in stable</li>
+      </ul>
+    </li>
+    <li>
+      Update build configurations for each new upstream release -
+      e.g. to enable new drivers
+    </li>
+    <li>
+      Try to ensure smooth upgrades when there are major
+      implementation changes - e.g. KMS, switch to libata drivers
+    </li>
+    <li>
+      Integrate <em>some</em> features not accepted upstream
+    </li>
+  </ul>
 </div>
 
 <div class="slide">