diff options
| author | Dave Hansen <dave.hansen@linux.intel.com> | 2024-03-22 11:34:03 -0700 |
|---|---|---|
| committer | Dave Hansen <dave.hansen@linux.intel.com> | 2024-04-02 09:40:23 -0700 |
| commit | bdc42c8b9befcef6368be345004cee3da1ace955 (patch) | |
| tree | cd97771c932aa8a2b86d3c686b354ea1d89a06ec /Documentation/process | |
| parent | 39cd87c4eb2b893354f3b850f916353f2658ae6f (diff) | |
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 <dave.hansen@linux.intel.com>
Acked-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/all/20240322183403.67BAEEFE%40davehans-spike.ostc.intel.com
Diffstat (limited to 'Documentation/process')
| -rw-r--r-- | Documentation/process/maintainer-tip.rst | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Documentation/process/maintainer-tip.rst b/Documentation/process/maintainer-tip.rst index 497bb39727c8..64739968afa6 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. |