linux-kernel - Re: [PATCH v1 3/4] docs: stable-kernel-rules: call mainline by its name and change example

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <2024041156-nintendo-paddling-eaad@gregkh>
Date: Thu, 11 Apr 2024 07:30:39 +0200
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: Thorsten Leemhuis <linux@...mhuis.info>
Cc: Sasha Levin <sashal@...nel.org>, Jonathan Corbet <corbet@....net>,
	stable@...r.kernel.org, workflows@...r.kernel.org,
	linux-doc@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v1 3/4] docs: stable-kernel-rules: call mainline by its
 name and change example

On Thu, Apr 11, 2024 at 07:25:05AM +0200, Thorsten Leemhuis wrote:
> 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.
> 
> Signed-off-by: Thorsten Leemhuis <linux@...mhuis.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 ebd57cb9277f7b..3c05f39858c78a 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
> @@ -127,7 +127,7 @@ comment to pass arbitrary or predefined notes:
>  
>     .. code-block:: none
>  
> -     Cc: <stable@...r.kernel.org> # after 4 weeks in mainline
> +     Cc: <stable@...r.kernel.org> # after 6 weeks in a stable mainline release

I do not know what "stable mainline release" means here, sorry.  "after
4 weeks in mainline" means "after in Linus's tree for 4 weeks, but
Linus's tree is not "stable mainline".

thanks,

greg k-h