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

From: tip-bot2 for Christian Kujau
Date: Mon May 15 2023 - 11:29:03 EST


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

Commit-ID: 4f1192559707eaa7adef307f5b9ad3a444b248f8
Gitweb: https://git.kernel.org/tip/4f1192559707eaa7adef307f5b9ad3a444b248f8
Author: Christian Kujau <lists@xxxxxxxxxxxxxxx>
AuthorDate: Sat, 18 Feb 2023 22:29:44 +01:00
Committer: Borislav Petkov (AMD) <bp@xxxxxxxxx>
CommitterDate: Mon, 15 May 2023 17:11:28 +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@xxxxxxxxx>
Signed-off-by: Christian Kujau <lists@xxxxxxxxxxxxxxx>
Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx>
Link: https://lore.kernel.org/r/8a1fd8b7-9fe3-b2b5-406e-fa6f5e03e7c0@xxxxxxxxxxxxxxx
---
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
^^^