[U-Boot] Please clarify "merge window"

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