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

Andy Whitcroft apw at canonical.com
Sat Apr 16 11:04:22 UTC 2011

On Fri, Apr 15, 2011 at 02:36:03PM -0400, Nicolas Pitre wrote:

> I don't understand why you guys are going through all this pain of 
> trying to linearize a Git history in order to transplant it onto another 
> base.

We work with rebase trees primarily because you end up with a clean set
of patches which represent your delta to your base.  If you merge any
updates required to those patches then appear in your merge commit, and
all merged together.  That makes ongoing maintenance of your
non-upstreamable delta much much harder.

> Now the Linaro tree itself is not rebased because there are consumers of 
> that tree merging it into theirs.  What I'd suggest is that the Ubuntu 
> flavor for OMAP4 should just do a merge as well.  Trying to use 
> format-patch here won't work very well because the history in Git is 
> two-dimensional and cannot be linearized into a simple series of patches 
> across merge commits.

I beleive that using the linaro base for this tree pretty much
necessaitates that yes, and that is why we are considering 'option (2)'
for this tree.


More information about the kernel-team mailing list