All the mail mirrored from lore.kernel.org
 help / color / mirror / Atom feed
From: Thorsten Leemhuis <linux@leemhuis.info>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Sasha Levin <sashal@kernel.org>
Cc: Jonathan Corbet <corbet@lwn.net>,
	stable@vger.kernel.org, workflows@vger.kernel.org,
	linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/5] docs: stable-kernel-rules: call mainline by its name and change example
Date: Mon, 29 Apr 2024 09:18:27 +0200	[thread overview]
Message-ID: <0a120573ea827aee12d45e7bd802ba85c09884da.1714367921.git.linux@leemhuis.info> (raw)
In-Reply-To: <cover.1714367921.git.linux@leemhuis.info>

Fine-tuning:

* s/Linus' tree/Linux mainline/, as mainline is the term used elsewhere
  in the document.

* Provide a better example for the 'delayed backporting' case that uses
  a fixed rather than a relative reference point, which makes it easier
  to handle for the stable team.

Signed-off-by: Thorsten Leemhuis <linux@leemhuis.info>
---
 Documentation/process/stable-kernel-rules.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst
index 0da9c57287c134..d28072b570f872 100644
--- a/Documentation/process/stable-kernel-rules.rst
+++ b/Documentation/process/stable-kernel-rules.rst
@@ -6,7 +6,7 @@ Everything you ever wanted to know about Linux -stable releases
 Rules on what kind of patches are accepted, and which ones are not, into the
 "-stable" tree:
 
- - It or an equivalent fix must already exist in Linus' tree (upstream).
+ - It or an equivalent fix must already exist in Linux mainline (upstream).
  - It must be obviously correct and tested.
  - It cannot be bigger than 100 lines, with context.
  - It must follow the
@@ -134,7 +134,7 @@ comment to pass arbitrary or predefined notes:
 
    .. code-block:: none
 
-     Cc: <stable@vger.kernel.org> # after 4 weeks in mainline
+     Cc: <stable@vger.kernel.org> # after -rc3
 
  * Point out known problems:
 
-- 
2.44.0


  parent reply	other threads:[~2024-04-29  7:18 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-29  7:18 [PATCH v2 0/5] docs: stable-kernel-rules: fine-tuning and 'no stable backport' tag Thorsten Leemhuis
2024-04-29  7:18 ` [PATCH v2 1/5] docs: stable-kernel-rules: reduce redundancy Thorsten Leemhuis
2024-04-29  7:18 ` Thorsten Leemhuis [this message]
2024-04-29  7:49   ` [PATCH v2 2/5] docs: stable-kernel-rules: call mainline by its name and change example Greg Kroah-Hartman
2024-04-29  7:18 ` [PATCH v2 3/5] docs: stable-kernel-rules: remove code-labels tags and a indention level Thorsten Leemhuis
2024-04-29  7:49   ` Greg Kroah-Hartman
2024-04-29  7:18 ` [PATCH v2 4/5] docs: stable-kernel-rules: explain use of stable@kernel.org (w/o @vger.) Thorsten Leemhuis
2024-04-29  7:51   ` Greg Kroah-Hartman
2024-04-29  8:30     ` Thorsten Leemhuis
2024-04-29  8:36       ` Greg Kroah-Hartman
2024-04-29  7:18 ` [PATCH v2 5/5] docs: stable-kernel-rules: create special tag to flag 'no backporting' Thorsten Leemhuis
2024-04-29  7:51   ` Greg Kroah-Hartman
2024-05-02 16:13 ` [PATCH v2 0/5] docs: stable-kernel-rules: fine-tuning and 'no stable backport' tag Jonathan Corbet

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0a120573ea827aee12d45e7bd802ba85c09884da.1714367921.git.linux@leemhuis.info \
    --to=linux@leemhuis.info \
    --cc=corbet@lwn.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sashal@kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=workflows@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.