Skip to contentSkip to conversation

Please clarify "merge window"

U-Boot York Sun 2 participants 3 messages Jun 3, 2016

lore
Share & tools
lore

York Sun

author
#0 lore raw

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

#1 lore raw
Quoted 14 lines · York Sun

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]

Quoted 6 lines

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.

Signature · 8 lines
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>
author
#2 lore raw
Quoted 23 lines · Tom Rini
Quoted 14 lines · York Sun

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]

Quoted 6 lines

Regards,

York

[1] http://www.denx.de/wiki/U-Boot/ReleaseCycle
[2] http://www.denx.de/wiki/U-Boot/DevelopmentProcess

Quoted 7 lines

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.

Thanks.

York