Skip to contentSkip to conversation

Merge window questions

U-Boot Peter Tyser 2 participants 2 messages Sep 11, 2008

lore
Share & tools
lore
#0 lore raw

Hello,
I'm assuming the merge window has been closed based on
http://www.denx.de/wiki/U-Boot/ReleaseCycle and the fact that v2008.10-rc1 has been tagged.

Does U-Boot accept new drivers/board support patches (ie new features which can't regress) outside of merge windows, or only bug fixes?

My understanding for the Linux kernel is that self-contained drivers/features are sometimes accepted after the merge window as they shouldn't cause the kernel to regress as no "old" code is using them.

I have patches for a new MPC8572-based board and was wondering if I should go ahead and send them out now, or wait until the next release in ~a month. I see other non-bugfix patches still being sent to the mailing list which gave me a glimmer of hope of getting the changes in the upcoming 2008.10 release:)

Thanks for any insight,
Peter

#1 lore raw

Dear Peter Tyser,

Quoted 3 lines · In message <[email protected]> you wrote:

Does U-Boot accept new drivers/board support patches (ie new features which can't regress) outside of merge windows, or only bug fixes?

Like in Linux, only bug fixes are accepted.

There is no such thing as new code that "can't regress". Please see also the recent discussion about this on LKML and Linus' clear statements:
http://thread.gmane.org/gmane.linux.network/104943/focus=104951
http://thread.gmane.org/gmane.linux.network/104943/focus=104945

Quoted 3 lines

My understanding for the Linux kernel is that self-contained drivers/features are sometimes accepted after the merge window as they shouldn't cause the kernel to regress as no "old" code is using them.

That used to be the case in Linux, and it turned out that it didn't work that well. We don't do this here.

Quoted 5 lines

I have patches for a new MPC8572-based board and was wondering if I should go ahead and send them out now, or wait until the next release in ~a month. I see other non-bugfix patches still being sent to the mailing list which gave me a glimmer of hope of getting the changes in the upcoming 2008.10 release:)

You better wait a while. Especially Jean-Christophe's Makefile patches will go in soon (as last bigger change in this release cycle) and these would certainly break your patch.

Once Jean-Christophe's Makefile patches have been applied (and any problems caused by them fixed), I ill issue -rc2, and then probably create a "next" branch. This might be used as a base for things like your patches.

Best regards,

Wolfgang Denk

Signature · 9 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
NEW GRAND UNIFIED THEORY DISCLAIMER: The Manufacturer May Technically
Be Entitled to Claim That This Product Is  Ten-Dimensional.  However,
the  Consumer Is Reminded That This Confers No Legal Rights Above and
Beyond Those Applicable to Three-Dimensional Objects, Since the Seven
New Dimensions Are "Rolled Up" into Such a  Small  "Area"  That  They
Cannot Be Detected.