On 04/12/2012 05:57 PM, Jon Medhurst (Tixy) wrote:
On Thu, 2012-04-12 at 17:37 +0400, Andrey Konovalov wrote:
Yes, the 12.04 release is going to be 3.4-rcX based. And indeed, there
were some conflicts when I tried rebasing your current topic branches
onto current mainline master branch (the vexpress-device-tree and the
hdlcd topics). It would be great if you rebase the ARM LT's topics to
3.4 (either v3.4-rc2 or tip - it shouldn't matter for my "rebase and
merge" script hopefully). It looks like the vexpress-device-tree topic
is the one to drop, and the hdlcd topic would be based on the mainline
tree directly? And no other changes to the layout of the ARM LT's
branches I am pulling from, right? Please confirm.
Correct, except I seem to remember that gator didn't build on 3.4
I'll start rebasing topics on rc2 tomorrow.
OK, thanks! Please ping me (email or IRC) when you are done.
On rc1 the MMC driver was broken and I don't think a fix went into rc2,
so I may need to add a new 'fixes' topic. Would it be good to have
something like that anyway, even if its a topic branch which is empty a
lot of the time?
Yes, that would be ok. The topic branch being empty a lot of time
shouldn't be a problem as well.
Thanks,
Andrey
_______________________________________________
linaro-dev mailing list
linaro-dev@lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-dev
