[U-Boot-Users] [PATCH 1/1] Add support for the hammerhead (AVR32) board

[Haavard Skinnemoen]

On Tue, 24 Jun 2008 09:22:13 -0700
Ben Warren <biggerbadderben at gmail.com> wrote:
> > ...though I'm not sure what the problem with incremental patches is,
> > assuming someone is willing to merge them before they finally go
> > upstream. I am willing to do that.
> >
> >   
> I personally think they're hard to follow, add unnecessary dependencies 
> and pollute the changelog.  But that's just my opinion.

I was thinking of creating some kind of "staging branch" where it could
evolve until some time before the next merge window. Then I'd just do a
"git rebase -i master" and suck it into my main branch as a single
commit, so the changelog should end up nice and tidy. Sort of like how
-mm works, except using git instead of quilt.

Not sure if it's a good idea or not...I still feel my workflow isn't
fully optimized ;-)

The alternative is doing a few more full respins on the mailing lists.
I personally think full patches get tiresome to review on the third
respin or so...so I kinda prefer incremental patches once things are
in reasonably good shape.
  
> Just another fun aspect of having non-orthogonal branches and patches.  
> The best solution would be for Wolfgang to pull my patch into mainline 
> (for r1.3.4).  Technically, a few rounds of the submission were posted 
> before the merge window closed, so maybe he'll be in a good mood after 
> vacation :)  Otherwise, I don't care - your idea works.  You can move a 
> few or all of the macb-using boards over and that would be cool.

I think I'll create a "hammerhead" branch and pull your "next" branch
into it. It will be kind of volatile anyway since I intend to rebase it
at least once before doing the final merge, so if it doesn't work out,
I can always drop your tree.

That said, your patch paves the way for a lot of nice cleanups in
net/eth.c, so IMO it would be a pity to have to wait another release
cycle before starting that work. In other words, feel free to add a
huge Acked-by from me and push it for 1.3.4 :-)

As for the other macb-using boards...maybe it would be easier to take
that through your tree? Heh, non-orthogonal patches again...

Haavard