Skip to content

Commit bdc42c8

Browse files
committed
Documentation/maintainer-tip: Clarify merge window policy
There are lots of maintainers "pings" during the merge window, even for trivial patches. Clarify that contributors should not expect progress on *any* non-urgent patches during the merge window. This applies to all contributions, not just large ones. Clarify the language around -rc1. Trees really are closed during the merge window. Signed-off-by: Dave Hansen <[email protected]> Acked-by: Borislav Petkov (AMD) <[email protected]> Link: https://lore.kernel.org/all/20240322183403.67BAEEFE%40davehans-spike.ostc.intel.com
1 parent 39cd87c commit bdc42c8

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Documentation/process/maintainer-tip.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -409,20 +409,20 @@ See :ref:`resend_reminders`.
409409
Merge window
410410
^^^^^^^^^^^^
411411

412-
Please do not expect large patch series to be handled during the merge
413-
window or even during the week before. Such patches should be submitted in
414-
mergeable state *at* *least* a week before the merge window opens.
415-
Exceptions are made for bug fixes and *sometimes* for small standalone
416-
drivers for new hardware or minimally invasive patches for hardware
417-
enablement.
412+
Please do not expect patches to be reviewed or merged by tip
413+
maintainers around or during the merge window. The trees are closed
414+
to all but urgent fixes during this time. They reopen once the merge
415+
window closes and a new -rc1 kernel has been released.
416+
417+
Large series should be submitted in mergeable state *at* *least* a week
418+
before the merge window opens. Exceptions are made for bug fixes and
419+
*sometimes* for small standalone drivers for new hardware or minimally
420+
invasive patches for hardware enablement.
418421

419422
During the merge window, the maintainers instead focus on following the
420423
upstream changes, fixing merge window fallout, collecting bug fixes, and
421424
allowing themselves a breath. Please respect that.
422425

423-
The release candidate -rc1 is the starting point for new patches to be
424-
applied which are targeted for the next merge window.
425-
426426
So called _urgent_ branches will be merged into mainline during the
427427
stabilization phase of each release.
428428

0 commit comments

Comments
 (0)