From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9BE50C04FE1 for ; Sat, 5 Aug 2023 07:21:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229834AbjHEHVn (ORCPT ); Sat, 5 Aug 2023 03:21:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229817AbjHEHVk (ORCPT ); Sat, 5 Aug 2023 03:21:40 -0400 Received: from wp530.webpack.hosteurope.de (wp530.webpack.hosteurope.de [80.237.130.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40B374ECA; Sat, 5 Aug 2023 00:21:38 -0700 (PDT) Received: from ip4d148da6.dynamic.kabel-deutschland.de ([77.20.141.166] helo=truhe.fritz.box); authenticated by wp530.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1qSBbT-0002p2-AL; Sat, 05 Aug 2023 09:21:35 +0200 From: Thorsten Leemhuis To: Greg KH , stable@vger.kernel.org Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Levin , Jonathan Corbet Subject: [PATCH v1 3/5] docs: stable-kernel-rules: make the examples for option 1 a proper list Date: Sat, 5 Aug 2023 09:21:31 +0200 Message-Id: <59deaabfabf0629d7cf2a52b196cec19d1f9ec47.1691219455.git.linux@leemhuis.info> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-bounce-key: webpack.hosteurope.de;linux@leemhuis.info;1691220098;d8ef99a8; X-HE-SMSGID: 1qSBbT-0002p2-AL Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org Separate the description for option 1 and the examples how to use it by making the latter an indented unordered list. No text changes. CC: Greg KH CC: Sasha Levin CC: Jonathan Corbet Signed-off-by: Thorsten Leemhuis --- Documentation/process/stable-kernel-rules.rst | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst index 61b4701d3469..597016297fb4 100644 --- a/Documentation/process/stable-kernel-rules.rst +++ b/Documentation/process/stable-kernel-rules.rst @@ -59,16 +59,18 @@ To have the patch automatically included in the stable tree, add the tag Cc: stable@vger.kernel.org -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. +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. -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: +To accompany a note to the stable team, use a shell-style inline comment (see +below for details): -.. code-block:: none + * 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: + + .. code-block:: none Cc: # 3.3.x: a1f84a3: sched: Check for idle Cc: # 3.3.x: 1b9508f: sched: Rate-limit newidle @@ -76,42 +78,42 @@ following format in the sign-off area: Cc: # 3.3.x Signed-off-by: Ingo Molnar -The tag sequence has the meaning of: + The tag sequence has the meaning of: -.. code-block:: none + .. code-block:: none git cherry-pick a1f84a3 git cherry-pick 1b9508f git cherry-pick fd21073 git cherry-pick -Also, some patches may have kernel version prerequisites. This can be -specified in the following format in the sign-off area: + * Also, some patches may have kernel version prerequisites. This can be + specified in the following format in the sign-off area: -.. code-block:: none + .. code-block:: none Cc: # 3.3.x -The tag has the meaning of: + The tag has the meaning of: -.. code-block:: none + .. code-block:: none git cherry-pick -For each "-stable" tree starting with the specified version. + For each "-stable" tree starting with the specified version. -To delay pick up of patches submitted via :ref:`option_1`, use the following -format: + * To delay pick up of patches submitted via :ref:`option_1`, use the following + format: -.. code-block:: none + .. code-block:: none Cc: # 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: + * 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 + .. code-block:: none Cc: # see patch description, needs adjustments for >= 6.3 -- 2.40.1