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>] [day] [month] [year] [list]
Message-ID: <bd85b781-c5a5-0dbe-f353-5b87a2de26bd@nerdbynature.de>
Date:   Sat, 18 Feb 2023 22:29:44 +0100 (CET)
From:   Christian Kujau <lists@...dbynature.de>
To:     Borislav Petkov <bp@...en8.de>
cc:     linux-kernel@...r.kernel.org
Subject: [PATCH] Documentation/process: Explain when tip branches get merged
 into mainline

Explain when tip branches get merged into mainline.
    
Signed-off-by: Christian Kujau <lists@...dbynature.de>
Suggested-by: Borislav Petkov <bp@...en8.de>

---
diff --git a/Documentation/process/maintainer-tip.rst b/Documentation/process/maintainer-tip.rst
index 572a3289c9cb..d43cc2272e83 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
 ^^^

-- 
BOFH excuse #282:

High altitude condensation from U.S.A.F prototype aircraft has contaminated the primary subnet mask. Turn off your computer for 9 days to avoid damaging it.

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ