Re: linux-linaro-core-tracking tree created / update frequency

On 05/03/2012 09:16 AM, Andrey Konovalov wrote:

On 05/03/2012 08:10 PM, John Stultz wrote:

...

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.

I wasn't exact enough. In fact the linux-linaro-core-tracking is mainline tip based, and the conflicting commits turned out to be post-v3.4-rc5. That's why the confusion.

Ok. I'll watch out for it next time I update my tree.

thanks -john