On 9/11/07, Wolfgang Denk wd@denx.de wrote:
The most invasive change is splitting the COBJS definitions into one line per file which is sure to cause merge conflicts with other boards which I'd like to avoid. I see three possible approaches:
- Merge the COBJS split into -testing now, and ask custodians to base
there changes onto that before the merge window opens 2. Merge the COBJS split at the start of the merge window before any other patches are merged 3. Merge the COBJS split at the end of the merge window and let me deal with the conflicts.
My preference is definitely #1, followed by #2. I think getting it in first will result in higher confidence that the change has not broken anything as each of the custodian trees will be testing against it before they request a pull.
I agree. Suggestion: let's wait for 1.3.0-rc2 (next weekend or so); then I'll update u-boot-testing and we use this as base for your work. I agree that we shoul have this in the tree before the next merge window opens.
Sounds good to me. I'll be ready. :-)
Cheers, g.