diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-13 17:33:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-13 17:33:48 -0700 |
| commit | 019040fb8144fd24097e8260ec0fe231634bfc81 (patch) | |
| tree | 29767d886826d4d7bebd2bba43bf32c0ce885ecd /Documentation/process | |
| parent | 6e5a0c30b616bfff6926ecca5d88e3d06e6bf79a (diff) | |
| parent | bdc42c8b9befcef6368be345004cee3da1ace955 (diff) | |
Merge tag 'x86-misc-2024-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull tip tree documentation update from Ingo Molnar:
- Update the -tip maintainers merge policy document wrt
merge window timing
* tag 'x86-misc-2024-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Documentation/maintainer-tip: Clarify merge window policy
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. |