From 2263c40e65255202f6f6d9dfa31d23906995ff7c Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Mon, 29 Apr 2024 09:18:27 +0200 Subject: [PATCH] docs: stable-kernel-rules: call mainline by its name and change example 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 that uses a fixed rather than a relative reference point, which makes it easier to handle for the stable team. Signed-off-by: Thorsten Leemhuis Reviewed-by: Greg Kroah-Hartman Signed-off-by: Jonathan Corbet Link: https://lore.kernel.org/r/0a120573ea827aee12d45e7bd802ba85c09884da.1714367921.git.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 0da9c57287c13..d28072b570f87 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 @@ -134,7 +134,7 @@ comment to pass arbitrary or predefined notes: .. code-block:: none - Cc: # after 4 weeks in mainline + Cc: # after -rc3 * Point out known problems: -- 2.49.0