X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=index.html;h=2f131ff8efefb492e1b58abf8f500addf50d4b97;hb=4ae4e65de0ba8481d4bdc4577b75088a69d23db0;hp=42ab750bf1ef3d74a2f62c22d7d24ff57d7ccd7a;hpb=c6ee39ccde8cd2b1a01091aa9747f216e537a30e;p=debian-kernel-talk.git

diff --git a/index.html b/index.html
index 42ab750..2f131ff 100644
--- a/index.html
+++ b/index.html
@@ -53,14 +53,121 @@
 
 <div class="slide">
   <h1>The author</h1>
+  <ul class="incremental">
+    <li>
+      Professional software developer since 1998
+    </li>
+    <li>
+      Debian contributor since 2003
+    </li>
+    <li>
+      Regular Linux contributor since 2008
+      <ul>
+	<li>
+	  Maintaining a net driver in my day job, plus core networking
+	  and PCI code as necessary
+	</li>
+      </ul>
+    </li>
+    <li>
+      Debian kernel contributor since 2008; uploader since 2009
+      <ul class="incremental">
+	<li>
+	  Initially trying to deal with the non-free firmware issue
+	</li>
+	<li>
+	  Moved on to triaging bugs, fixing bugs, backporting
+	  features, updating packaging...
+	</li>
+      </ul>
+    </li>
+  </ul>
 </div>
 
 <div class="slide">
   <h1>Linux kernel</h1>
+  <ul class="incremental">
+    <li>
+      Started by Linus Torvalds in 1991 as a kernel for i386
+      PCs: <q>just a hobby, won't be big and professional like gnu</q>
+    </li>
+    <li>
+      Adopted as the kernel of the Debian system in 1993
+    </li>
+    <li>
+      After 20 years' development, supports more hardware
+      architectures and devices than anything else
+      <ul class="incremental">
+	<li>
+	  Hardware vendors <em>must</em> provide Linux drivers because
+	  their customers demand it
+	</li>
+      </ul>
+    </li>
+    <li>
+      Still the default kernel for the Debian system
+    </li>
+  </ul>
 </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">
@@ -91,5 +198,38 @@
   <h1>Questions?</h1>
 </div>
 
+<div class="slide">
+  <h1>Credits</h1>
+  <ul>
+    <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>
+
 </body>
 </html>