From: Dave Hansen <dave.hansen@linux.intel.com>
To: linux-kernel@vger.kernel.org
Cc: x86@kernel.org,bp@alien8.de,Dave Hansen <dave.hansen@linux.intel.com>
Subject: [PATCH] Documentation/maintainer-tip: Clarify merge window policy
Date: Fri, 22 Mar 2024 11:34:03 -0700 [thread overview]
Message-ID: <20240322183403.67BAEEFE@davehans-spike.ostc.intel.com> (raw)
From: Dave Hansen <dave.hansen@linux.intel.com>
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>
---
b/Documentation/process/maintainer-tip.rst | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff -puN Documentation/process/maintainer-tip.rst~maintainer-tip-merge-window Documentation/process/maintainer-tip.rst
--- a/Documentation/process/maintainer-tip.rst~maintainer-tip-merge-window 2024-03-22 10:58:48.064400749 -0700
+++ b/Documentation/process/maintainer-tip.rst 2024-03-22 11:09:06.688554211 -0700
@@ -407,20 +407,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.
_
next reply other threads:[~2024-03-22 18:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-22 18:34 Dave Hansen [this message]
2024-03-22 19:15 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240322183403.67BAEEFE@davehans-spike.ostc.intel.com \
--to=dave.hansen@linux.intel.com \
--cc=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®