On Thu, May 3, 2012 at 6:10 PM, John Stultz <john.stu...@linaro.org> wrote: > On 05/03/2012 07:15 AM, Alexander Sack wrote: >> >> On Thu, May 3, 2012 at 4:00 PM, Andrey Konovalov >> <andrey.konova...@linaro.org> wrote: >>> >>> Sorry for the delay. >>> >>> I've updated the linux-linaro-core-tracking, but it currently misses the >>> linaro-android-3.4 topic. Will put the linaro-android-3.4 topic back >>> after >>> resolving the merge conflicts; guess later today. >> >> Is the resolution simple enough? Otherwise, feels that the better >> scalable approach is that the topic owner (e.g. John Stultz for the >> time being) gets notified and asked to fix the merge conflict on his >> side. Your daily merge scripts would then pick it up automatically as >> soon as the merge conflict is resolved. > > > So Andrey mailed me that there was a conflict between Linus' v3.4-rc5 and > the Android tree, but when I went to updated the tree sort it out, > v.3.4-rc5 merged in without any issues. I suspect the collision is with > something else in the linaro tree, but haven't yet gotten any feedback as to > what that might be. >
OK, feels we could benefit from getting Andreys tools out and enable you to easily fold linux-linaro with your your own local topic? Would this help you to more easily converge, prepare and maintain topics that coexist in linux-linaro? -- Alexander Sack Technical Director, Linaro Platform Teams http://www.linaro.org | Open source software for ARM SoCs http://twitter.com/#!/linaroorg - http://www.linaro.org/linaro-blog _______________________________________________ linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
