From: Thorsten Leemhuis <linux@leemhuis.info>
To: Greg KH <gregkh@linuxfoundation.org>, stable@vger.kernel.org
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
Sasha Levin <sashal@kernel.org>, Jonathan Corbet <corbet@lwn.net>
Subject: [PATCH v1 3/5] docs: stable-kernel-rules: make the examples for option 1 a proper list
Date: Sat, 5 Aug 2023 09:21:31 +0200 [thread overview]
Message-ID: <59deaabfabf0629d7cf2a52b196cec19d1f9ec47.1691219455.git.linux@leemhuis.info> (raw)
In-Reply-To: <cover.1691219455.git.linux@leemhuis.info>
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: Thorsten Leemhuis <linux@leemhuis.info>
---
Documentation/process/stable-kernel-rules.rst | 48 ++++++++++---------
1 file changed, 25 insertions(+), 23 deletions(-)
diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst
index 61b4701d3469..597016297fb4 100644
--- a/Documentation/process/stable-kernel-rules.rst
+++ b/Documentation/process/stable-kernel-rules.rst
@@ -59,16 +59,18 @@ 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
-patch prerequisites which can be cherry-picked. This can be specified in the
-following format in the sign-off area:
+To accompany a note to the stable team, use a shell-style inline comment (see
+below for details):
-.. code-block:: none
+ * 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:
+
+ .. code-block:: none
Cc: <stable@vger.kernel.org> # 3.3.x: a1f84a3: sched: Check for idle
Cc: <stable@vger.kernel.org> # 3.3.x: 1b9508f: sched: Rate-limit newidle
@@ -76,42 +78,42 @@ following format in the sign-off area:
Cc: <stable@vger.kernel.org> # 3.3.x
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-The tag sequence has the meaning of:
+ The tag sequence has the meaning of:
-.. code-block:: none
+ .. code-block:: none
git cherry-pick a1f84a3
git cherry-pick 1b9508f
git cherry-pick fd21073
git cherry-pick <this commit>
-Also, some patches may have kernel version prerequisites. This can be
-specified in the following format in the sign-off area:
+ * Also, some patches may have kernel version prerequisites. This can be
+ specified in the following format in the sign-off area:
-.. code-block:: none
+ .. code-block:: none
Cc: <stable@vger.kernel.org> # 3.3.x
-The tag has the meaning of:
+ The tag has the meaning of:
-.. code-block:: none
+ .. code-block:: none
git cherry-pick <this commit>
-For each "-stable" tree starting with the specified version.
+ For each "-stable" tree starting with the specified version.
-To delay pick up of patches submitted via :ref:`option_1`, use the following
-format:
+ * To delay pick up of patches submitted via :ref:`option_1`, use the following
+ format:
-.. code-block:: none
+ .. 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
-add a note to the stable tag. This for example can be used to point out known
-problems:
+ * 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:
-.. code-block:: none
+ .. code-block:: none
Cc: <stable@vger.kernel.org> # see patch description, needs adjustments for >= 6.3
--
2.40.1
next prev parent reply other threads:[~2023-08-05 7:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-05 7:21 [PATCH v1 0/5] docs: stable-kernel-rules: improve structure and a few tweaks Thorsten Leemhuis
2023-08-05 7:21 ` [PATCH v1 1/5] docs: stable-kernel-rules: improve structure by changing headlines Thorsten Leemhuis
2023-08-05 7:21 ` [PATCH v1 2/5] docs: stable-kernel-rules: move text around to improve flow Thorsten Leemhuis
2023-08-05 7:21 ` Thorsten Leemhuis [this message]
2023-08-05 7:21 ` [PATCH v1 4/5] docs: stable-kernel-rules: fine-tune various details Thorsten Leemhuis
2023-08-05 7:21 ` [PATCH v1 5/5] docs: stable-kernel-rules: mention that regressions must be prevented Thorsten Leemhuis
2023-08-05 7:54 ` [PATCH v1 0/5] docs: stable-kernel-rules: improve structure and a few tweaks Thorsten Leemhuis
2023-08-12 11:03 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=59deaabfabf0629d7cf2a52b196cec19d1f9ec47.1691219455.git.linux@leemhuis.info \
--to=linux@leemhuis.info \
--cc=corbet@lwn.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®