summaryrefslogtreecommitdiff
path: root/Documentation/process
diff options
context:
space:
mode:
authorSalvatore Bonaccorso <carnil@debian.org>2022-09-01 20:43:28 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-09-09 10:49:45 +0200
commitbdbb0bbcf858adb26dfcd27f26f91cbf33338d4c (patch)
tree67c7737566ac9ccd18622ac6293c5f5218a6517c /Documentation/process
parent6ea3bf466ac6ad6c0ee1ad4e80d77d62e5e11c7a (diff)
Documentation: stable: Document alternative for referring upstream commit hash
Additionally to the "commit <sha1> upstream." variant, "[ Upstream commit <sha1> ]" is used as well as alternative to refer to the upstream commit hash. Signed-off-by: Salvatore Bonaccorso <carnil@debian.org> Link: https://lore.kernel.org/r/20220901184328.4075701-1-carnil@debian.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/process')
-rw-r--r--Documentation/process/stable-kernel-rules.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst
index c61865e91f52..2fd8aa593a28 100644
--- a/Documentation/process/stable-kernel-rules.rst
+++ b/Documentation/process/stable-kernel-rules.rst
@@ -97,6 +97,12 @@ text, like this:
commit <sha1> upstream.
+or alternatively:
+
+.. code-block:: none
+
+ [ Upstream commit <sha1> ]
+
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: