Skip to content

Commit 2263c40

Browse files
knurdJonathan Corbet
authored andcommitted
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 <[email protected]> Reviewed-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Jonathan Corbet <[email protected]> Link: https://lore.kernel.org/r/0a120573ea827aee12d45e7bd802ba85c09884da.1714367921.git.linux@leemhuis.info
1 parent db48330 commit 2263c40

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Documentation/process/stable-kernel-rules.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Everything you ever wanted to know about Linux -stable releases
66
Rules on what kind of patches are accepted, and which ones are not, into the
77
"-stable" tree:
88

9-
- It or an equivalent fix must already exist in Linus' tree (upstream).
9+
- It or an equivalent fix must already exist in Linux mainline (upstream).
1010
- It must be obviously correct and tested.
1111
- It cannot be bigger than 100 lines, with context.
1212
- It must follow the
@@ -134,7 +134,7 @@ comment to pass arbitrary or predefined notes:
134134

135135
.. code-block:: none
136136
137-
Cc: <[email protected]> # after 4 weeks in mainline
137+
Cc: <[email protected]> # after -rc3
138138
139139
* Point out known problems:
140140

0 commit comments

Comments
 (0)