summaryrefslogtreecommitdiff
path: root/Documentation/process
diff options
context:
space:
mode:
authorThorsten Leemhuis <linux@leemhuis.info>2023-07-11 08:19:53 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-08-05 08:31:41 +0200
commitd0bde9ca0ecff2e58e223dd6ae0e63156553b283 (patch)
treeca0962fc35b2c6f8999d03ac95ecb386873181f1 /Documentation/process
parentd2e8071bed0befa3304acb01edd4a228d81fc4d2 (diff)
docs: stable-kernel-rules: mention other usages for stable tag comments
Document how to delay backporting or send a note to the stable team using shell-style inline comments attached to stable tags. 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> Link: https://lore.kernel.org/r/bf1489b40ff358b7cb4f7d8cc73d5c7c3c143471.1689056247.git.linux@leemhuis.info Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/process')
-rw-r--r--Documentation/process/stable-kernel-rules.rst22
1 files changed, 19 insertions, 3 deletions
diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst
index 51df1197d5ab..de0046c0586b 100644
--- a/Documentation/process/stable-kernel-rules.rst
+++ b/Documentation/process/stable-kernel-rules.rst
@@ -55,9 +55,10 @@ To have the patch automatically included in the stable tree, add the tag
Cc: stable@vger.kernel.org
-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.
+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.
.. _option_2:
@@ -139,6 +140,21 @@ 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
+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
+add a note to the stable tag. This for example can be used to point out known
+problems:
+
+.. code-block:: none
+
+ Cc: <stable@vger.kernel.org> # see patch description, needs adjustments for >= 6.3
+
Following the submission:
- The sender will receive an ACK when the patch has been accepted into the