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

diff --git a/index.html b/index.html
index 546aa04..824fe94 100644
--- a/index.html
+++ b/index.html
@@ -48,6 +48,7 @@
 
 <div class="slide">
 <h1>The Linux kernel in Debian</h1>
+<object data="tux-debian.svg" width="35%" align="right"></object>
 <h3>Ben Hutchings</h3>
 </div>
 
@@ -111,11 +112,118 @@
 </div>
 
 <div class="slide">
-  <h1>Linux release model</h1>
+  <h1>Linux release model (1)</h1>
+  <p>
+    The old model:
+  </p>
+  <ul class="incremental">
+    <li>
+      Each stable release had even second component.  Bug fixes and
+      minor features in stable releases with third component
+      incremented (e.g. 2.4.27)
+    </li>
+    <li>
+      Major development done separately, resulting in series of
+      unstable releases with odd second component (e.g. 2.5.50)
+    </li>
+    <li>
+      After a year or two, development resulted in a new stable
+      release
+    </li>
+    <li>
+      Problem: users waited years for new features, and then got many
+      more changes all at once.  Particularly bad in the 2.4-2.6
+      transition.
+    </li>
+  </ul>
+</div>
+
+<div class="slide">
+  <h1>Linux release model (2)</h1>
+  <p>
+    The new model:
+  </p>
+  <ul class="incremental">
+    <li>
+      Development results in a new stable(-ish) release every 2-3
+      months
+      <ul class="incremental">
+	<li>
+	  git (and previously BitKeeper) made distributed development
+          and testing a lot easier
+	</li>
+      </ul>
+    </li>
+    <li>
+      Each 2.6.<var>x</var> release has stable update branch; releases
+      numbered 2.6.<var>x</var>.<var>y</var>
+      <ul class="incremental">
+	<li>
+	  Usually closed shortly after next stable release, but may
+	  continue as a 'longterm' branch (e.g. 2.6.32.<var>y</var>)
+	</li>
+      </ul>
+    </li>
+    <li>
+      Linux 3.0 doesn't change this, except that <var>x</var> is now
+      the second component and <var>y</var> is the third
+    </li>
+  </ul>
+</div>
+
+<div class="slide">
+  <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</h1>
+  <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">
@@ -145,6 +253,38 @@
 <div class="slide">
   <h1>Credits</h1>
   <ul>
+    <li>
+      Linux 'Tux' logo &copy; Larry Ewing, Simon Budig.
+      <!--
+Redistribution is free but has to include this notice.
+      -->
+      <ul>
+	<li>Modified by me to add Debian open-ND logo</li>
+      </ul>
+    </li>
+    <li>
+      Debian open-ND logo &copy; Software in the Public Interest, Inc.
+      <!--
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+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.
       <!--