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

Jan, Sebastien s-jan at ti.com
Thu Apr 14 17:21:15 UTC 2011

On Thu, Apr 14, 2011 at 8:01 AM, Bryan Wu <bryan.wu at canonical.com> wrote:
>> As the linaro base tree and its sources are all merge trees there is no
>> single guarenteed patch application order for the patches it represents.
>> This means that any attempt to flatten this 2k patch stream into a linear
>> rebasable chain is very, very likely to throw up essentially false merge
>> conflicts which have to be resolved and these in turn engender inverse
>> conflicts later in the stack.  With so very many patches and worse so many
>> merges this is increasingly likely to occur, and I predict this will make
>> it near impossible to convert it into a rebase tree in its current form.
> 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

>> 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.

More information about the kernel-team mailing list