X-Git-Url: https://git.decadent.org.uk/gitweb/?p=stable-kernel-talk.git;a=blobdiff_plain;f=index.html;h=afa097f07180c1c7986145666cd47d4d6f59b854;hp=c303bf1b97fee0c165b555b3e4be53c6fda63c19;hb=a1d6174ba5fb69b3cd9d45fe39b2af203e54927d;hpb=977f69564879aa552520e559b3327909ede37125
diff --git a/index.html b/index.html
index c303bf1..afa097f 100644
--- a/index.html
+++ b/index.html
@@ -111,31 +111,27 @@
The stable update process (2)
-
- 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
-
- 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
-
- 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
-
- 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
-
- 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.
-
Maintainer announces the release, shortly followed by LWN