On Wed, Apr 18, 2012 at 3:04 AM, Andy Green <andy.green@linaro.org> wrote:

On 04/18/2012 06:16 AM, Somebody in the thread at some point said:

Hi -

> I've pushed the current linux-linaro tree
> to git://git.linaro.org/kernel/linux-linaro-tracking.git , linux-linaro
> branch.
>
> This is still work in progress, and it misses few topics. But due to
> limited access to hardware at the moment it would be good to try it
> sooner than later on vexpress and origen at least. (I have only panda on
> hand). Minimal boot test has been passed on the panda, though I had to
> disable CPUFREQ for the board to boot (haven't looked deeper yet).
>
> Not included are the following topics present in the 12.03 release:
> * tracking-linaro_cpuidle: there are conflicts when rebasing it to
> v3.4-rc3. The topic owner has been notified, and should tell me how to
> proceed.
> * tracking-umm-3.3-wip: this one seems to be in v3.4-rc3 mainline tree,
> correct?
> * tracking-linaro-android-3.4: I've tried it with a smaller subset of
> the topics (w/o LT's ones), and it merged ok, but there are some
> conflicts with the LT's stuff as it seems. Will have a deeper look
> tomorrow. No action from John is required at the moment.
>
> Here is the list of the topic included into this tree currently:
> # integration <name> <base> <topic1> <topic2> ... <topicN>
> # - the merge order is <topic1> to <topicN>.
> integration linux-linaro v3.4-rc3 ufs emmc thermal_exynos4_imx6
> linaro-configs-3.4 armlt-hdlcd armlt-mmc armlt-arm-arch-fixes
> armlt-misc-fixes armlt-ubuntu-config armlt-android-config armlt-gator
> samslt-base samslt-core samslt-bl samslt-dt samslt-fb samslt-pd
> samslt-rtc samslt-s2ram samslt-asv_cpufreq thermal_exynos4_imx6
> samslt-led samslt-dummy_reg samslt-gadget samslt-touch samslt-wlan
> samslt-audio samslt-hdmi samslt-mali samslt-cma_v24 unsorted
>
> Where the topics are:
> # topic <local branch> <remote/branch> <topic base>
> # - <base> must be another topic
> # Example1: tracking-armlt-gator lt_arm/tracking-armlt-gator
> # - missing <topic base> here assumes the mainline Linus tree.
> #
> # ARM LT topics:
> topic armlt-hdlcd lt_arm/tracking-armlt-hdlcd

...

> # Samsung LT topics:
> topic samslt-base lt_samsung/topic/base
> topic samslt-asv_cpufreq lt_samsung/topic/asv_cpufreq samslt-base

...

What's the plan for this new linux-linaro approach of putting LT trees
in there?

Previously, until 3.2 when I tried to change base to it anyway,
linux-linaro was like flavouring, it had a bunch of goodies we could add
to our vanilla LT trees and we got

Has it changed approach to be the combined tree now? So there is no
longer a flavouring tree we can use to get the goodies from without
having to deal with an increasing number of LT trees merged as well?
(Or if it changed name to another branch, fine, but what is it)

If so that will make things complicated to synchronize the LT trees you
intend to bind here, to ensure they're all working with same UMM
revision you mandate, etc before the binding.

linux-linaro combines all topics that are registered and in our manifest. We don't restrict ourselves to non-enablement topics. Actually, we always wanted enablement to be part of it and since we want to learn what that means we decided to pick up a few pilot enablement topics.

I guess the pure WG flavored tree you are looking for is not produced in a direct manner, but you can probably just pull in the topics from our linux-linaro manifest by stripping the other LT topics.

Andrey will also produce a pinned manifest that gives you concrete info which commit from the individual topic branches got merged into the linux-linaro tree. This should make it feasible to extract just the subset you care about.

On the general point of conflicts through putting multiple hw enablement together: We have discussed a feature of "conflicting" topics that would mitigate the problem by producing a tree for each topic that has conflicts that leaves out the conflicting topics. At this point in time, we cannot handle conflicting topics yet ... our tools have to get in shape for that first and we expect to be closer to such a point by Connect.

Last: ultimately we hope that putting things together will ensure that we figure out how to stay aligned and non conflicting. I think it's an important exercise to go through and learn from.