diff options
| author | Thorsten Leemhuis <linux@leemhuis.info> | 2024-04-29 09:18:27 +0200 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2024-05-02 10:09:17 -0600 |
| commit | 2263c40e65255202f6f6d9dfa31d23906995ff7c (patch) | |
| tree | a3e8f501711e937cd4df578cac8e37f5d0401e74 | |
| parent | db483303b58f175cf7508ccfb1d5514f2488f11e (diff) | |
| download | lwn-2263c40e65255202f6f6d9dfa31d23906995ff7c.tar.gz lwn-2263c40e65255202f6f6d9dfa31d23906995ff7c.zip | |
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 <linux@leemhuis.info>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Link: https://lore.kernel.org/r/0a120573ea827aee12d45e7bd802ba85c09884da.1714367921.git.linux@leemhuis.info
| -rw-r--r-- | Documentation/process/stable-kernel-rules.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst index 0da9c57287c1..d28072b570f8 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: <stable@vger.kernel.org> # after 4 weeks in mainline + Cc: <stable@vger.kernel.org> # after -rc3 * Point out known problems: |