Skip to content

Commit 189057a

Browse files
knurdgregkh
authored andcommitted
docs: stable-kernel-rules: make the examples for option 1 a proper list
Separate the description for option 1 and the examples how to use it by making the latter an indented unordered list. No text changes. CC: Greg KH <[email protected]> CC: Sasha Levin <[email protected]> CC: Jonathan Corbet <[email protected]> Signed-off-by: Thorsten Leemhuis <[email protected]> Link: https://lore.kernel.org/r/59deaabfabf0629d7cf2a52b196cec19d1f9ec47.1691219455.git.linux@leemhuis.info Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 3feb21b commit 189057a

File tree

1 file changed

+25
-23
lines changed

1 file changed

+25
-23
lines changed

Documentation/process/stable-kernel-rules.rst

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -59,59 +59,61 @@ To have the patch automatically included in the stable tree, add the tag
5959
6060
6161
62-
in the sign-off area. To accompany a note to the stable team, use a shell-style
63-
inline comment (see below for details). Once the patch is merged it will be
64-
applied to the stable tree without anything else needing to be done by the
65-
author or subsystem maintainer.
62+
in the sign-off area. Once the patch is merged it will be applied to the
63+
stable tree without anything else needing to be done by the author or
64+
subsystem maintainer.
6665

67-
Additionally, some patches submitted via :ref:`option_1` may have additional
68-
patch prerequisites which can be cherry-picked. This can be specified in the
69-
following format in the sign-off area:
66+
To accompany a note to the stable team, use a shell-style inline comment (see
67+
below for details):
7068

71-
.. code-block:: none
69+
* Additionally, some patches submitted via :ref:`option_1` may have additional
70+
patch prerequisites which can be cherry-picked. This can be specified in the
71+
following format in the sign-off area:
72+
73+
.. code-block:: none
7274
7375
Cc: <[email protected]> # 3.3.x: a1f84a3: sched: Check for idle
7476
Cc: <[email protected]> # 3.3.x: 1b9508f: sched: Rate-limit newidle
7577
Cc: <[email protected]> # 3.3.x: fd21073: sched: Fix affinity logic
7678
Cc: <[email protected]> # 3.3.x
7779
Signed-off-by: Ingo Molnar <[email protected]>
7880
79-
The tag sequence has the meaning of:
81+
The tag sequence has the meaning of:
8082

81-
.. code-block:: none
83+
.. code-block:: none
8284
8385
git cherry-pick a1f84a3
8486
git cherry-pick 1b9508f
8587
git cherry-pick fd21073
8688
git cherry-pick <this commit>
8789
88-
Also, some patches may have kernel version prerequisites. This can be
89-
specified in the following format in the sign-off area:
90+
* Also, some patches may have kernel version prerequisites. This can be
91+
specified in the following format in the sign-off area:
9092

91-
.. code-block:: none
93+
.. code-block:: none
9294
9395
Cc: <[email protected]> # 3.3.x
9496
95-
The tag has the meaning of:
97+
The tag has the meaning of:
9698

97-
.. code-block:: none
99+
.. code-block:: none
98100
99101
git cherry-pick <this commit>
100102
101-
For each "-stable" tree starting with the specified version.
103+
For each "-stable" tree starting with the specified version.
102104

103-
To delay pick up of patches submitted via :ref:`option_1`, use the following
104-
format:
105+
* To delay pick up of patches submitted via :ref:`option_1`, use the following
106+
format:
105107

106-
.. code-block:: none
108+
.. code-block:: none
107109
108110
Cc: <[email protected]> # after 4 weeks in mainline
109111
110-
For any other requests related to patches submitted via :ref:`option_1`, just
111-
add a note to the stable tag. This for example can be used to point out known
112-
problems:
112+
* For any other requests related to patches submitted via :ref:`option_1`, just
113+
add a note to the stable tag. This for example can be used to point out known
114+
problems:
113115

114-
.. code-block:: none
116+
.. code-block:: none
115117
116118
Cc: <[email protected]> # see patch description, needs adjustments for >= 6.3
117119

0 commit comments

Comments
 (0)