[Natty] [ti-omap4] [Pull Request]: 2.6.38.2 based updates

[Andy Green]

On 04/14/2011 06:21 PM, Somebody in the thread at some point said:

Hi -

>> Exactly, for Linaro release we found it merges several branches from
>> upstream and stable tree, while for TI OMAP4 patches (come from Sebjan
>> and Andy Green) are all linear I think.
>
> Right: I provided a re-based tree because I knew it would fit well
> with the Ubuntu regular strategy.
> But for the future I am open to look at a merge strategy if it's more
> convenient.

I'm actually carrying two branches that resolve to the same tree.  My 
master branch is using rebase against npitre's tree and allows going 
back down the patch stack to refine the patches to feed his tree, but 
for Bryan I keep a for-ubuntu branch with a history.  I plan to, and 
have been, adding patches as necessary to keep the diff between the two 
trees at zero.

>>> There seem to be two viable approaches (to my eye), though I am fully
>>> open to other ideas:
>>>
>>> 1) squash the delta into a 'omap4' patch and carry that, or
>>> 2) accept that this is a merge based tree and develop new handling for
>>>    this kind of tree.
>
>  From my point of view, I definitely prefer option 2. But the end call
> belongs to you.

Yeah option 2 is the way forward I think.

-Andy