linux-kernel - [tip: x86/cleanups] Documentation/process: Explain when tip branches get merged into mainline

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]

Date:   Mon, 08 May 2023 13:41:24 -0000
From:   "tip-bot2 for Christian Kujau" <tip-bot2@...utronix.de>
To:     linux-tip-commits@...r.kernel.org
Cc:     Borislav Petkov <bp@...en8.de>,
        Christian Kujau <lists@...dbynature.de>, x86@...nel.org,
        linux-kernel@...r.kernel.org
Subject: [tip: x86/cleanups] Documentation/process: Explain when tip branches
 get merged into mainline

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     cb5d28c01b2d56700e1656cd6c3742b40e840bf9
Gitweb:        https://git.kernel.org/tip/cb5d28c01b2d56700e1656cd6c3742b40e840bf9
Author:        Christian Kujau <lists@...dbynature.de>
AuthorDate:    Sat, 18 Feb 2023 22:29:44 +01:00
Committer:     Borislav Petkov (AMD) <bp@...en8.de>
CommitterDate: Mon, 08 May 2023 15:35:00 +02:00

Documentation/process: Explain when tip branches get merged into mainline

Explain when tip branches get merged into mainline.

Suggested-by: Borislav Petkov <bp@...en8.de>
Signed-off-by: Christian Kujau <lists@...dbynature.de>
Signed-off-by: Borislav Petkov (AMD) <bp@...en8.de>
Link: https://lore.kernel.org/r/8a1fd8b7-9fe3-b2b5-406e-fa6f5e03e7c0@nerdbynature.de
---
 Documentation/process/maintainer-tip.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/process/maintainer-tip.rst b/Documentation/process/maintainer-tip.rst
index 178c95f..93d8a79 100644
--- a/Documentation/process/maintainer-tip.rst
+++ b/Documentation/process/maintainer-tip.rst
@@ -421,6 +421,9 @@ allowing themselves a breath. Please respect that.
 The release candidate -rc1 is the starting point for new patches to be
 applied which are targeted for the next merge window.
 
+So called _urgent_ branches will be merged into mainline during the
+stabilization phase of each release.
+
 
 Git
 ^^^