iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the -tip maintainers merge policy document wrt. merge window timing.

Browse Source 
Signed-off-by: Ingo Molnar <mingo@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCgAvFiEEBpT5eoXrXCwVQwEKEnMQ0APhK1gFAmZByY8RHG1pbmdvQGtl
 cm5lbC5vcmcACgkQEnMQ0APhK1hexg//dEy6eIhXq3wgr1ozdy3JGR/fkQMwcn8H
 dcffxx7dmWY+K0oXwBOq89gQI2q05351DTTsEPUHqzifsq0cNIyegboNCfelhtDv
 srhNDV6j43WtJGWVu/iLKWGZ9j3D+HyU/vhTVuDXHEfGED63QkF48ULDcAukH1d/
 hDhwdAFXgTMalANbHxPBsNv5V3siY8p14QD0gK4OYu0swfmIu8cUQMLu52U+G+7O
 7+W/4SEZBjXRc1xD3WQ5NeUZ2/uWaxu7iye5O6OCSWYj5nG6ak7P3iu/xiLpq/ki
 mAlPZsxdKETdhnZMtE3Ids31vuuSRZX0dU4POZFm62FGtpRksJYuFaFbXATer595
 Humou6zDI72IES5OQAIuVmVr6gMdb9zgMIcOqEPYBul9GJcVyIBop13LmJVwWDoX
 2ZLIixGahaDiVJZe6NJ/GkZBxcfrb32Wo64HvKNFLHKwzw3HBovzS+dxcxI5bCdq
 fUXn/unGf8Gemrq/YusGYsaSAA0KmorTyMWfqVQCDxSUxxiatJyUWmappjuzh0f8
 EMSVBeSe0Vi+up8THzZUGjquYAMuQhRbRHZvGlUuobFKzNyjAnWQnRuOr9+v7zhb
 wzHvEf6MbcC+cL9jaVLqzru3cCpF8KkZU8OPJt9e6w2TUpi9sdJd/7rAzYHwAcdo
 yzbCXy+yAnk=
 =T6km
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-05-13 17:33:48 -07:00
commit 019040fb81
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Documentation/process/maintainer-tip.rst
View File

@ -409,20 +409,20 @@ See :ref:`resend_reminders`.
Merge window Merge window
^^^^^^^^^^^^ ^^^^^^^^^^^^
Please do not expect large patch series to be handled during the merge Please do not expect patches to be reviewed or merged by tip
window or even during the week before. Such patches should be submitted in maintainers around or during the merge window. The trees are closed
mergeable state *at* *least* a week before the merge window opens. to all but urgent fixes during this time. They reopen once the merge
Exceptions are made for bug fixes and *sometimes* for small standalone window closes and a new -rc1 kernel has been released.
drivers for new hardware or minimally invasive patches for hardware
enablement. 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 During the merge window, the maintainers instead focus on following the
upstream changes, fixing merge window fallout, collecting bug fixes, and upstream changes, fixing merge window fallout, collecting bug fixes, and
allowing themselves a breath. Please respect that. 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 So called _urgent_ branches will be merged into mainline during the
stabilization phase of each release. stabilization phase of each release.