X-Git-Url: https://git.decadent.org.uk/gitweb/?p=stable-kernel-talk.git;a=blobdiff_plain;f=index.html;h=712ecd4caa4a43698be61c12dadeb924d6c20de7;hp=0d9a78c83e0fd6356e9a8fbc4667c372b3cfa143;hb=d1153fffa72aa14807a396d54293a4de3b589860;hpb=8d93d40cbb65f884b5342c724c5ff4b725be88b8

diff --git a/index.html b/index.html
index 0d9a78c..712ecd4 100644
--- a/index.html
+++ b/index.html
@@ -103,6 +103,43 @@
   </ul>
 </div>
 
+<div class="slide">
+  <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
+      <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
+	</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
+	</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
+    </li>
+    <li>
+      Greg pushes the tag to kernel.org (possibly after pulling
+      from the other maintainer) which generates tarballs,
+      updates the front page, etc.
+    </li>
+    <li>
+      Maintainer announces the release, shortly followed by LWN
+      and other news media
+    </li>
+  </ul>
+</div>
+
 <div class="slide">
   <h1>Credits</h1>
   <ul>