public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] Please clarify "merge window"
Date: Fri, 3 Jun 2016 16:42:15 -0400	[thread overview]
Message-ID: <20160603204215.GA11619@bill-the-cat> (raw)
In-Reply-To: <5751D642.5040902@nxp.com>

On Fri, Jun 03, 2016 at 12:10:58PM -0700, York Sun wrote:

> Tom and Wolfgang,
> 
> Would you please clarify "merge window" again? We have conflicting information
> regarding if merge window is considered submission window.
> 
> "After the merge window closes, no new features may be added to allow for a
> release candidate phase which is intended to fix bugs and regressions." [1]
> 
> vs
> 
> "A patch that is generally in good shape and that was submitted while the Merge
> Window was open is eligible to go into the upcoming release, even if changes and
> resubmits are needed." [2]
> 
> Regards,
> 
> York
> 
> [1] http://www.denx.de/wiki/U-Boot/ReleaseCycle
> [2] http://www.denx.de/wiki/U-Boot/DevelopmentProcess

So, the rule is not iron-clad.  This is not the Linux kernel and failure
to be ready to merge by -rc1 does not mean something cannot go in.  But
by that same token, now that we're down to a 2 month release cycle I
feel much happier to say No to change that come too late and are too
invasive.  Some big change that's posted in time but then not ready to
merge until 3 weeks until release is something I'm going to hold off on.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160603/b4306c24/attachment.sig>

  reply	other threads:[~2016-06-03 20:42 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-03 19:10 [U-Boot] Please clarify "merge window" York Sun
2016-06-03 20:42 ` Tom Rini [this message]
2016-06-03 20:52   ` York Sun

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=20160603204215.GA11619@bill-the-cat \
    --to=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    /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