X-Git-Url: https://git.decadent.org.uk/gitweb/?p=debian-kernel-talk.git;a=blobdiff_plain;f=index.html;h=28f279ed9d5e65a06b12844ad3bf8fbe60118800;hp=c5f243ea59ab84a3c12fcef4ad37c173ac08a2bd;hb=c782b9e6acea585d59c473a4da4254b6d6648868;hpb=b51dd7b9ac7376b4d3c5a279eefd7429c21878b9

diff --git a/index.html b/index.html
index c5f243e..28f279e 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" />
@@ -22,6 +22,8 @@
   table { border-collapse: collapse }
   th { border-bottom: 2pt solid black }
   th, td { padding: 0 6pt }
+  .package { font-family: monospace }
+  var { font-family: sans }
 </style>
 <style type="text/css" media="print">
   .slide { page-break-after: always }
@@ -35,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>
 
@@ -49,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&nbsp;Hutchings and Max&nbsp;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>
@@ -72,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>
@@ -85,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">
@@ -112,36 +120,9 @@
 </div>
 
 <div class="slide">
-  <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>
+  <h1>Linux release model</h1>
   <p>
-    The new model:
+    Since ~2004:
   </p>
   <ul class="incremental">
     <li>
@@ -155,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
@@ -164,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>
 
@@ -179,7 +157,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:
@@ -229,31 +207,32 @@
 <div class="slide">
   <h1>Official Linux kernel packages (1)</h1>
   <p>
-    Main source package is linux-2.6 (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>
-      linux-image-<var>upstream</var>-<var>abi</var>-<var>flavour</var>
+      <span class="package">linux-image-<var>upstream</var>-<var>abi</var>-<var>flavour</var></span>
       - compiled kernel and modules
     </li>
     <li>
-      linux-headers-<var>upstream</var>-<var>abi</var>-<var>flavour</var>
+      <span class="package">linux-headers-<var>upstream</var>-<var>abi</var>-<var>flavour</var></span>
       (and others) - development package for OOT modules
     </li>
     <li>
-      linux-libc-dev - headers for userland
+      <span class="package">linux-libc-dev</span> - headers for userland
     </li>
     <li>
-      linux-source-<var>upstream</var> - for custom kernels
+      <span class="package">linux-source-<var>upstream</var></span> -
+      for custom kernels
     </li>
     <li>
-      linux-doc-<var>upstream</var>, linux-tools-<var>upstream</var>,
-      etc.
+      <span class="package">linux-doc-<var>upstream</var></span>,
+      <span class="package">linux-manual-<var>upstream</var></span>, etc.
     </li>
     <li>
-      linux-support-<var>upstream</var>-<var>abi</var> - scripts and
-      metadata to support linux-latest-2.6
+      <span class="package">linux-support-<var>upstream</var>-<var>abi</var></span> -
+      scripts and metadata to support linux-latest
     </li>
   </ul>
 </div>
@@ -261,23 +240,27 @@
 <div class="slide">
   <h1>Official Linux kernel packages (2)</h1>
   <p>
-    The linux-latest-2.6 source package builds meta-packages to
-    support automatic upgrades between binaries built from linux-2.6.
+    The <span class="package">linux-latest</span> source package builds meta-packages
+    to support automatic upgrades between binaries built
+    from <span class="package">linux</span>.
   </p>
   <ul class="incremental">
     <li>
-      linux-image-<var>flavour</var>
+      <span class="package">linux-image-<var>flavour</var></span>
     </li>
     <li>
-      linux-headers-<var>flavour</var>
+      <span class="package">linux-headers-<var>flavour</var></span>
     </li>
     <li>
-      linux-source, linux-doc, linux-tools, etc.
+      <span class="package">linux-source</span>,
+      <span class="package">linux-doc</span>,
+      <span class="package">linux-tools</span>, etc.
     </li>
   </ul>
   <p class="incremental">
-    The installer will normally install linux-image-<var>flavour</var>
-    (for some appropriate <var>flavour</var>).
+    The installer will normally install
+    <span class="package">linux-image-<var>flavour</var></span> (for
+    some appropriate <var>flavour</var>).
   </p>
 </div>
 
@@ -285,14 +268,29 @@
   <h1>Official Linux kernel packages (3)</h1>
   <ul class="incremental">
     <li>
-      firmware-free - separate 'firmware' compliant with DFSG
+      <span class="package">firmware-free</span> - separate 'firmware'
+      compliant with DFSG
     </li>
     <li>
-      linux-base - base package for images and tools
+      <span class="package">linux-base</span> - base package for
+      images and tools
     </li>
     <li>
-      linux-kbuild-2.6 builds linux-kbuild-<var>upstream</var> -
-      code used 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>
@@ -317,14 +315,44 @@
   </p>
   <ul class="incremental">
     <li>
-      <tt>make && make install</tt>
+      <span class="package">make && make install</span>
+    </li>
+    <li>
+      <span class="package">make deb-pkg</span> - build packages
+    </li>
+    <li>
+      <span class="package">make-kpkg</span> - build packages with
+      more customisation; requires
+      <span class="package">kernel-package</span>
+    </li>
+  </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 - being reimplemented upstream with cgroups
+      and namespaces
     </li>
     <li>
-      <tt>make deb-pkg</tt> - build packages
+      Xen - now upstream
     </li>
     <li>
-      <tt>make-kpkg</tt> - build packages with more customisation;
-      requires kernel-package
+      aufs - needed for Debian Live
+    </li>
+    <li>
+      PREEMPT_RT - gradually being merged upstream; new option in
+      amd64 and i386 packages
     </li>
   </ul>
 </div>
@@ -341,13 +369,13 @@
   </p>
   <ul class="incremental">
     <li>
-      <tt>dkms</tt> - builds and installs modules automatically.  Can
-      build packages for installation on other systems.  Also
-      supported by Ubuntu and SUSE.
+      <span class="package">dkms</span> - builds and installs modules
+      automatically.  Can build packages for installation on other
+      systems.  Also supported by Ubuntu and SUSE.
     </li>
     <li>
-      <tt>module-assistant</tt> - builds packages as directed.
-      Uses a separate package name for each kernel ABI.
+      <span class="package">module-assistant</span> - builds packages
+      as directed.  Uses a separate package name for each kernel ABI.
     </li>
   </ul>
 </div>
@@ -369,12 +397,13 @@
       files installed
     </li>
     <li>
-      Kernel team maintains <tt>firmware-nonfree</tt> source package
+      Kernel team maintains
+      <span class="package">firmware-nonfree</span> source package
       covering most firmware files that are clearly redistributable
     </li>
     <li>
       Also collected in linux-firmware.git repository maintained by
-      David Woodhouse and myself
+      David Woodhouse and Ben Hutchings
     </li>
   </ul>
 </div>
@@ -383,19 +412,20 @@
   <h1>Documentation</h1>
   <ul class="incremental">
     <li>
-      <tt>manpages-dev</tt> - the system call API
+      <span class="package">manpages-dev</span> - the system call API
     </li>
     <li>
-      <tt>linux-doc-</tt><var>upstream</var> - miscellaneous upstream
-      documentation
+      <span class="package">linux-doc-</span><var>upstream</var> -
+      miscellaneous upstream documentation
     </li>
     <li>
-      <tt>linux-manual-</tt><var>upstream</var> - the internal API,
-      based on structured comments
+      <span class="package">linux-manual-</span><var>upstream</var> -
+      the internal API, based on structured comments
     </li>
     <li>
-      <tt>debian-kernel-handbook</tt> - Debian-specific information;
-      currently also Linux-specific but could cover other kernels
+      <span class="package">debian-kernel-handbook</span> -
+      Debian-specific information; currently also Linux-specific but
+      could cover other kernels
     </li>
     <li>
       <a href="http://wiki.debian.org/DebianKernel">http://wiki.debian.org/DebianKernel</a>
@@ -417,7 +447,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>
@@ -443,33 +473,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>
 
