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

diff --git a/index.html b/index.html
index 4c0af61..f3e57f6 100644
--- a/index.html
+++ b/index.html
@@ -120,36 +120,9 @@
 </div>
 
 <div class="slide">
-  <h1>Linux release model (1)</h1>
+  <h1>Linux release model</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:
+    Since ~2004:
   </p>
   <ul class="incremental">
     <li>
@@ -163,8 +136,9 @@
       </ul>
     </li>
     <li>
-      Each 2.6.<var>x</var> release has stable update branch; releases
-      numbered 2.6.<var>x</var>.<var>y</var>
+      Each 2.6.<var>x</var> and 3.<var>x</var> release has a stable
+      update branch; releases numbered 2.6.<var>x</var>.<var>y</var>
+      and 3.<var>x</var>.<var>y</var>
       <ul class="incremental">
 	<li>
 	  Usually closed shortly after next stable release, but may
@@ -172,10 +146,6 @@
 	</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>
 
@@ -237,8 +207,8 @@
 <div class="slide">
   <h1>Official Linux kernel packages (1)</h1>
   <p>
-    Main source package is <span class="package">linux-2.6</span>
-    (still!).  Most binary package names change regularly.
+    Main source package is <span class="package">linux</span>.  Most
+    binary package names change regularly.
   </p>
   <ul class="incremental">
     <li>
@@ -258,11 +228,11 @@
     </li>
     <li>
       <span class="package">linux-doc-<var>upstream</var></span>,
-      <span class="package">linux-tools-<var>upstream</var></span>, etc.
+      <span class="package">linux-manual-<var>upstream</var></span>, etc.
     </li>
     <li>
       <span class="package">linux-support-<var>upstream</var>-<var>abi</var></span> -
-      scripts and metadata to support linux-latest-2.6
+      scripts and metadata to support linux-latest
     </li>
   </ul>
 </div>
@@ -270,9 +240,9 @@
 <div class="slide">
   <h1>Official Linux kernel packages (2)</h1>
   <p>
-    The <span class="package">linux-latest-2.6</span> source package builds meta-packages
+    The <span class="package">linux-latest</span> source package builds meta-packages
     to support automatic upgrades between binaries built
-    from <span class="package">linux-2.6</span>.
+    from <span class="package">linux</span>.
   </p>
   <ul class="incremental">
     <li>
@@ -306,9 +276,21 @@
       images and tools
     </li>
     <li>
-      <span class="package">linux-kbuild-2.6</span> builds
-      <span class="package">linux-kbuild-<var>upstream</var></span> -
-      kernel build system and tools for building OOT modules
+      <span class="package">linux-tools</span> builds
+      <ul>
+	<li>
+	  <span class="package">linux-kbuild-<var>upstream</var></span> -
+	  kernel build system and tools for building OOT modules
+	</li>
+	<li>
+	  <span class="package">linux-tools-<var>upstream</var></span>
+	  - perf tool
+	</li>
+	<li>
+	  <span class="package">usbip</span> - usbip configuration
+	  tools
+	</li>
+      </ul>
     </li>
   </ul>
 </div>