Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Jonathan Corbet <corbet@lwn.net>
To:     Salvatore Bonaccorso <carnil@debian.org>
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Sasha Levin <sashal@kernel.org>, linux-doc@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Salvatore Bonaccorso <carnil@debian.org>
Subject: Re: [PATCH v3] Documentation: stable: Document alternative for
 referring upstream commit hash
In-Reply-To: <20220901184328.4075701-1-carnil@debian.org>
References: <20220901184328.4075701-1-carnil@debian.org>
Date:   Wed, 21 Sep 2022 14:05:38 -0600
Message-ID: <87pmfov6gd.fsf@meer.lwn.net>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

Salvatore Bonaccorso <carnil@debian.org> writes:

> 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>
> ---
> 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:

Applied, thanks.

jon