Linaro and common- tree

Andy Green andy.green at linaro.org
Thu Oct 6 02:29:03 UTC 2011


On 6 October 2011 06:14, Mathieu Poirier <mathieu.poirier at linaro.org> wrote:

> Good afternoon Andy,
>
> I am currently working on rebasing the STE GLK kernel to the
> androidization branch.  Doing so I have the following questions:
>
> 1. You have made it clear that linaro-androidization-tracking is
> tracking Linus HEAD but is it also tracking kernel/common.git HEAD on
> the android side
>

It's not tracking it in terms of using it as a basis.  We would follow it
and pick new stuff that looked relevant.  But right now, there is no
common-3.1 branch we have access to that we can pick from.


> 2. What will be the rebase strategy ?  Every week ?  And when you do
> rebase, how do you intend to let the followers (like me) know ?


If you think about how you will consume the tree, your desire to use it at a
particular basis will be driven by your own rebase schedule for your vanilla
tree.  So if you have your tracking tree going on -rc5, you are going to
want -rc5 Androidization tree.  If you don't have -rc5 tracking tree, you
don't care if we have -rc5 Androidization tree or not.

What I suggest is for your tracking branch don't rebase against Linus repo
direct but rebase against this

http://git.linaro.org/gitweb?p=people/andygreen/kernel-tilt.git;a=shortlog;h=refs/heads/linux-2.6-master

it is the last pull that we did from Linus tree, all of our TILT trees and
the Androidization tree will be using that as their basis.  It's always pure
Linus tree but the basis is exactly what we are using in our other trees.

Sometimes (ie, after -rc0) we will be blocked from pushing the
Androidization tree for a while because it's regressed.  The approach we
will take then is not to push an update until the known regressions are at
least contained or at best gone.  However, your LT tracking tree is likely
going to be in a similar position at that time for the same reasons.

Otherwise we'll be trying to provide it for each -rc at least and make those
persistent using either tags or the branch archive repo we already run.

-Andy
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linaro.org/pipermail/linaro-dev/attachments/20111006/f525e562/attachment.html>


More information about the linaro-dev mailing list