| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220901184328.4075701-1-carnil@debian.org>
Date: Thu, 1 Sep 2022 20:43:28 +0200
From: Salvatore Bonaccorso <carnil@...ian.org>
To: Jonathan Corbet <corbet@....net>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Sasha Levin <sashal@...nel.org>, linux-doc@...r.kernel.org,
linux-kernel@...r.kernel.org,
Salvatore Bonaccorso <carnil@...ian.org>
Subject: [PATCH v3] 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@...ian.org>
---
Changes in v3:
- Revert to initial version as not adding the code-block:: none will
reformat the block differently than the first variant.
Changes in v2:
- Drop extra RST markup which just only clutters things without any
advantage.
Documentation/process/stable-kernel-rules.rst | 6 ++++++
1 file changed, 6 insertions(+)
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:
--
2.37.2
Powered by blists - more mailing lists