On Thu, Apr 11, 2024 at 07:25:05AM +0200, Thorsten Leemhuis wrote:
Fine-tuning:
s/Linus' tree/Linux mainline/, as mainline is the term used elsewhere in the document.
Provide a better example for the 'delayed backporting' case.
Signed-off-by: Thorsten Leemhuis linux@leemhuis.info
Documentation/process/stable-kernel-rules.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst index ebd57cb9277f7b..3c05f39858c78a 100644 --- a/Documentation/process/stable-kernel-rules.rst +++ b/Documentation/process/stable-kernel-rules.rst @@ -6,7 +6,7 @@ Everything you ever wanted to know about Linux -stable releases Rules on what kind of patches are accepted, and which ones are not, into the "-stable" tree:
- It or an equivalent fix must already exist in Linus' tree (upstream).
- It or an equivalent fix must already exist in Linux mainline (upstream).
- It must be obviously correct and tested.
- It cannot be bigger than 100 lines, with context.
- It must follow the
@@ -127,7 +127,7 @@ comment to pass arbitrary or predefined notes: .. code-block:: none
Cc: <stable@vger.kernel.org> # after 4 weeks in mainline
Cc: <stable@vger.kernel.org> # after 6 weeks in a stable mainline release
I do not know what "stable mainline release" means here, sorry. "after 4 weeks in mainline" means "after in Linus's tree for 4 weeks, but Linus's tree is not "stable mainline".
thanks,
greg k-h