aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/process
diff options
context:
space:
mode:
authorChristian Kujau <lists@nerdbynature.de>2023-02-18 22:29:44 +0100
committerBorislav Petkov (AMD) <bp@alien8.de>2023-05-15 17:11:28 +0200
commit4f1192559707eaa7adef307f5b9ad3a444b248f8 (patch)
tree8cb2ec750be131428b6a6e3c55a3f5d80f11704a /Documentation/process
parentf1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 (diff)
downloadlinux-4f1192559707eaa7adef307f5b9ad3a444b248f8.tar.gz
Documentation/process: Explain when tip branches get merged into mainline
Explain when tip branches get merged into mainline. Suggested-by: Borislav Petkov <bp@alien8.de> Signed-off-by: Christian Kujau <lists@nerdbynature.de> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/8a1fd8b7-9fe3-b2b5-406e-fa6f5e03e7c0@nerdbynature.de
Diffstat (limited to 'Documentation/process')
-rw-r--r--Documentation/process/maintainer-tip.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/process/maintainer-tip.rst b/Documentation/process/maintainer-tip.rst
index 178c95fd17dca..93d8a794bdfc6 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
^^^