Commit 189057a1 authored by Thorsten Leemhuis's avatar Thorsten Leemhuis Committed by Greg Kroah-Hartman
Browse files

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 <gregkh@linuxfoundation.org>
CC: Sasha Levin <sashal@kernel.org>
CC: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: default avatarThorsten Leemhuis <linux@leemhuis.info>
Link: https://lore.kernel.org/r/59deaabfabf0629d7cf2a52b196cec19d1f9ec47.1691219455.git.linux@leemhuis.info


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3feb21bb

Documentation/process/stable-kernel-rules.rst

+25 −23
Original line number Diff line number Diff line
@@ -59,12 +59,14 @@ To have the patch automatically included in the stable tree, add the tag 


     Cc: stable@vger.kernel.org



in the sign-off area. To accompany a note to the stable team, use a shell-style

inline comment (see below for details). Once the patch is merged it will be

applied to the stable tree without anything else needing to be done by the

author or subsystem maintainer.

in the sign-off area. Once the patch is merged it will be applied to the

stable tree without anything else needing to be done by the author or

subsystem maintainer.



Additionally, some patches submitted via :ref:`option_1` may have additional

To accompany a note to the stable team, use a shell-style inline comment (see

below for details):



 * Additionally, some patches submitted via :ref:`option_1` may have additional

   patch prerequisites which can be cherry-picked. This can be specified in the

   following format in the sign-off area:
@@ -85,7 +87,7 @@ The tag sequence has the meaning of: 
     git cherry-pick fd21073

     git cherry-pick <this commit>



Also, some patches may have kernel version prerequisites.  This can be

 * Also, some patches may have kernel version prerequisites.  This can be

    specified in the following format in the sign-off area:



   .. code-block:: none
@@ -100,14 +102,14 @@ The tag has the meaning of: 


   For each "-stable" tree starting with the specified version.



To delay pick up of patches submitted via :ref:`option_1`, use the following

 * To delay pick up of patches submitted via :ref:`option_1`, use the following

   format:



   .. code-block:: none



     Cc: <stable@vger.kernel.org> # after 4 weeks in mainline



For any other requests related to patches submitted via :ref:`option_1`, just

 * For any other requests related to patches submitted via :ref:`option_1`, just

   add a note to the stable tag. This for example can be used to point out known

   problems: