On 12 September 2012 17:56, Andrey Konovalov andrey.konovalov@linaro.org wrote:
Greetings,
The linux-linaro-core-tracking (llct) tree has been moved to v3.6-rc5 base. All the topics existed in the 12.08 version of llct have been carried over into the updated tree with few easy to resolve conflicts. The only one which needs attention is due to commit "ASoC: Samsung: Fix build error" [1]. In fact I had to revert it because it doesn't work with the multiplatform topic (the latter renames all the arch/arm/mach-<name>/include/mach dirs to arch/arm/mach-<name>/include/mach-<name>). Sachin or Tushar, could you take a look please?
Thanks for bringing this to notice. Will check and let you know.
Also the big-LITTLE-MP topic has been updated to v3.6-rc5 based big-LITTLE-MP-v8. The current list of the llct topics can be found in [2].
12.09 will most probably be v3.6-rc6 based. But for the moment I've tried rebasing the linux-linaro (ll) tree to the current v3.6-rc5 based llct, and encountered no merge issues. The current list of the ll topics can be found in [3]. The plan is to have single topic from the ARM LT (like the Samsung LT code is represented now) this month vs several one-per-feature topics.
In 12.08 the linux-linaro-tracking (llt) tree was v3.4 based, and had recent code from TI LT plus the older code (no changes for couple months) from ARM and Samsung LTs. Any changes here in 12.09? (Are we on v3.4 still, are there other LTs to add to this tree?). And yes, this month llc-3.4 "core stable" tree will be introduced (first of all, to get the Gator updates for v3.4, and some critical fixes), and llt will start using it as a base. No more details atm, should have something in git by the end of this week.
Please let me know if there are any updates to the existing topics, or new topics missing. And if there are obsoleted topics. The linux-linaro and linux-linaro-tracking trees will be frozen (only bug fixes would be accepted afterwards, no new additions) by the end of September 18.
Thanks, Andrey
[1] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git%3Ba=commitdiff%...
[2] http://git.linaro.org/gitweb?p=kernel/linux-linaro-manifest.git%3Ba=blob%3Bf...
[3] http://git.linaro.org/gitweb?p=kernel/linux-linaro-manifest.git%3Ba=blob%3Bf...
linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev