X-Git-Url: https://git.decadent.org.uk/gitweb/?p=stable-kernel-talk.git;a=blobdiff_plain;f=index.html;h=9dd36d429cfa48c6ff6d4f99e7a813d8377dd7db;hp=52567ff3a3d1fa33775c68576aa06d75f2ae0c71;hb=HEAD;hpb=929759125f4548474dbaff7a33a1a79265b502f9

diff --git a/index.html b/index.html
index 52567ff..9dd36d4 100644
--- a/index.html
+++ b/index.html
@@ -95,11 +95,15 @@
       notified and may provide a backported version
     </li>
     <li>
-      Any commit in Linus's tree, or a fix for a stable-only
-      regression, can be nominated by mail to this list, if it
+      Any commit in Linus's tree can be nominated by mail to this list, if it
       meets the criteria - see
       <a href="http://www.kernel.org/doc/Documentation/stable_kernel_rules.txt"><tt>Documentation/stable_kernel_rules.txt</tt></a>
     </li>
+    <li>
+      Occasional regression fix in stable without a corresponding
+      commit in Linus's tree, because the change that regressed was
+      OK in mainline
+    </li>
   </ul>
 </div>
 
@@ -107,31 +111,27 @@
   <h1>The stable update process (2)</h1>
   <ul>
     <li>
-      Stable branch maintainer sends pending changes to the mailing
-      list, the original authors, etc., for a time-limited period of
-      review and testing
+      Maintainer sends pending changes to mailing list, original
+      authors, etc., for time-limited review and testing
       <ul>
 	<li>
-	  Although the changes have been accepted by Linus, some might
-	  not be needed in a stable branch or might not work due to
-	  missing dependencies
+	  Fix might not be needed in a stable branch, or might not
+	  work due to missing dependencies
 	</li>
 	<li>
-	  A fix might have been found to introduce a regression in
-	  mainline, so should only be applied to the stable branch
-	  along with a second fix for the regression
+	  Fix might have been found to introduce a regression in
+	  mainline, so must wait until second fix available
 	</li>
       </ul>
     </li>
     <li>
-      All changes that passed review (and maybe some that were
-      added) are applied to the stable branch and the release is
-      tagged
+      Maintainer drops/adds changes based on review, then applies
+      to stable branch and tags release
     </li>
     <li>
-      Greg pushes the tag to kernel.org (possibly after pulling
-      from the other maintainer) which generates tarballs,
-      updates the front page, etc.
+      Greg pushes tag to kernel.org (possibly after pulling from
+      another maintainer) which generates tarballs, updates the front
+      page, etc.
     </li>
     <li>
       Maintainer announces the release, shortly followed by LWN
@@ -200,6 +200,14 @@
   </ul>
 </div>
 
+<div class="slide">
+  <h1>Questions?</h1>
+  <p>
+    The FAQ is
+    <a href="http://www.kernel.org/doc/Documentation/stable_kernel_rules.txt"><tt>Documentation/stable_kernel_rules.txt</tt></a>
+  </p>
+</div>
+
 <div class="slide">
   <h1>Credits</h1>
   <ul>