Skip to content

Commit 88d99e8

Browse files
bagasmegregkh
authored andcommitted
Documentation: update stable review cycle documentation
In recent times, the review cycle for stable releases have been changed. In particular, there is release candidate phase between ACKing patches and new stable release. Also, in case of failed submissions (fail to apply to stable tree), manual backport (Option 3) have to be submitted instead. Update the release cycle documentation on stable-kernel-rules.rst to reflect the above. Cc: Sasha Levin <sashal@kernel.org> Cc: Jonathan Corbet <corbet@lwn.net> Cc: linux-kernel@vger.kernel.org Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> Link: https://lore.kernel.org/r/20220314113329.485372-4-bagasdotme@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9015813 commit 88d99e8

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

Documentation/process/stable-kernel-rules.rst

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ it to be applied to.
8383
:ref:`option_2` and :ref:`option_3` are more useful if the patch isn't deemed
8484
worthy at the time it is applied to a public git tree (for instance, because
8585
it deserves more regression testing first). :ref:`option_3` is especially
86-
useful if the patch needs some special handling to apply to an older kernel
87-
(e.g., if API's have changed in the meantime).
86+
useful if the original upstream patch needs to be backported (for example
87+
the backport needs some special handling due to e.g. API changes).
8888

8989
Note that for :ref:`option_3`, if the patch deviates from the original
9090
upstream patch (for example because it had to be backported) this must be very
@@ -153,8 +153,17 @@ Review cycle
153153
- If the patch is rejected by a member of the committee, or linux-kernel
154154
members object to the patch, bringing up issues that the maintainers and
155155
members did not realize, the patch will be dropped from the queue.
156-
- At the end of the review cycle, the ACKed patches will be added to the
157-
latest -stable release, and a new -stable release will happen.
156+
- The ACKed patches will be posted again as part of release candidate (-rc)
157+
to be tested by developers and testers.
158+
- Usually only one -rc release is made, however if there are any outstanding
159+
issues, some patches may be modified or dropped or additional patches may
160+
be queued. Additional -rc releases are then released and tested until no
161+
issues are found.
162+
- Responding to the -rc releases can be done on the mailing list by sending
163+
a "Tested-by:" email with any testing information desired. The "Tested-by:"
164+
tags will be collected and added to the release commit.
165+
- At the end of the review cycle, the new -stable release will be released
166+
containing all the queued and tested patches.
158167
- Security patches will be accepted into the -stable tree directly from the
159168
security kernel team, and not go through the normal review cycle.
160169
Contact the kernel security team for more details on this procedure.

0 commit comments

Comments
 (0)