aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2024-05-01 19:51:19 +0200
committerIngo Molnar <mingo@kernel.org>2024-05-01 19:51:19 +0200
commit5f8edd7b610fa2672e27db0c9c1e5de19bb4fe02 (patch)
tree71fc494fe1b87e93f19edfbccc85a5a6d5063985
parentf2940b6c9e7de0dcc4d349299603595b9d9fa503 (diff)
parentbdc42c8b9befcef6368be345004cee3da1ace955 (diff)
downloadtip-5f8edd7b610fa2672e27db0c9c1e5de19bb4fe02.tar.gz
Merge branch into tip/master: 'x86/misc'
Notice: this object is not reachable from any branch.
# New commits in x86/misc: bdc42c8b9bef ("Documentation/maintainer-tip: Clarify merge window policy") Signed-off-by: Ingo Molnar <mingo@kernel.org>
Notice: this object is not reachable from any branch.
-rw-r--r--Documentation/process/maintainer-tip.rst18
1 files changed, 9 insertions, 9 deletions
diff --git a/Documentation/process/maintainer-tip.rst b/Documentation/process/maintainer-tip.rst
index 497bb39727c8b..64739968afa63 100644
--- a/Documentation/process/maintainer-tip.rst
+++ b/Documentation/process/maintainer-tip.rst
@@ -409,20 +409,20 @@ See :ref:`resend_reminders`.
Merge window
^^^^^^^^^^^^
-Please do not expect large patch series to be handled during the merge
-window or even during the week before. Such patches should be submitted in
-mergeable state *at* *least* a week before the merge window opens.
-Exceptions are made for bug fixes and *sometimes* for small standalone
-drivers for new hardware or minimally invasive patches for hardware
-enablement.
+Please do not expect patches to be reviewed or merged by tip
+maintainers around or during the merge window. The trees are closed
+to all but urgent fixes during this time. They reopen once the merge
+window closes and a new -rc1 kernel has been released.
+
+Large series should be submitted in mergeable state *at* *least* a week
+before the merge window opens. Exceptions are made for bug fixes and
+*sometimes* for small standalone drivers for new hardware or minimally
+invasive patches for hardware enablement.
During the merge window, the maintainers instead focus on following the
upstream changes, fixing merge window fallout, collecting bug fixes, and
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.