summaryrefslogtreecommitdiff
path: root/Documentation/process
diff options
context:
space:
mode:
authorSalvatore Bonaccorso <carnil@debian.org>2022-09-01 20:43:28 +0200
committerJonathan Corbet <corbet@lwn.net>2022-09-27 13:21:44 -0600
commit67fe6792a7fb9b7af85d1abf44605c3ab7d3b5f7 (patch)
tree63d8ef669a4e705b68a7310887c2258593495d7d /Documentation/process
parent8bfdfa0d6b929ede7b6189e0e546ceb6a124d05d (diff)
downloadlinux-riscv-67fe6792a7fb9b7af85d1abf44605c3ab7d3b5f7.tar.gz
linux-riscv-67fe6792a7fb9b7af85d1abf44605c3ab7d3b5f7.tar.bz2
linux-riscv-67fe6792a7fb9b7af85d1abf44605c3ab7d3b5f7.zip
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: Jonathan Corbet <corbet@lwn.net>
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: