I went ahead and forward ported the AOSP-3.3 tree to 3.4-rc1.
You can grab it here: git://git.linaro.org/people/jstultz/android.git linaro-android-3.4-jstultz-rebase
thanks -john
On 04/09/2012 03:18 PM, John Stultz wrote:
I went ahead and forward ported the AOSP-3.3 tree to 3.4-rc1.
You can grab it here: git://git.linaro.org/people/jstultz/android.git linaro-android-3.4-jstultz-rebase
Sigh. Looks like the Google devs are following close behind and released their own 3.4-rc2 based tree.
Don't get me wrong: Its great to see them keeping up with mainline, but I've clearly duplicated their work this cycle.
I've gone ahead and mirrored the AOSP 3.4 tree here: git://git.linaro.org/people/jstultz/android.git linaro-android-3.4
Andrey: Probably you're call on this. If you've already merged in my rebase tree it should be fine for 12.04, but if not you might want to jump over to the AOSP 3.4 tree.
thanks -john
On 04/11/2012 11:19 PM, John Stultz wrote:
On 04/09/2012 03:18 PM, John Stultz wrote:
I went ahead and forward ported the AOSP-3.3 tree to 3.4-rc1.
You can grab it here: git://git.linaro.org/people/jstultz/android.git linaro-android-3.4-jstultz-rebase
Sigh. Looks like the Google devs are following close behind and released their own 3.4-rc2 based tree.
Don't get me wrong: Its great to see them keeping up with mainline, but I've clearly duplicated their work this cycle.
I've gone ahead and mirrored the AOSP 3.4 tree here: git://git.linaro.org/people/jstultz/android.git linaro-android-3.4
Andrey: Probably you're call on this. If you've already merged in my rebase tree it should be fine for 12.04, but if not you might want to jump over to the AOSP 3.4 tree.
Hi John, No, not merged your rebase tree yet (still busy with the script to produce the linux-linaro-tracking tree). Will use your linaro-android-3.4 branch for 12.04. Thanks a lot for your efforts!
- Andrey
thanks -john
On Wed, 2012-04-11 at 23:29 +0400, Andrey Konovalov wrote:
On 04/11/2012 11:19 PM, John Stultz wrote:
On 04/09/2012 03:18 PM, John Stultz wrote:
I went ahead and forward ported the AOSP-3.3 tree to 3.4-rc1.
You can grab it here: git://git.linaro.org/people/jstultz/android.git linaro-android-3.4-jstultz-rebase
Sigh. Looks like the Google devs are following close behind and released their own 3.4-rc2 based tree.
Don't get me wrong: Its great to see them keeping up with mainline, but I've clearly duplicated their work this cycle.
I've gone ahead and mirrored the AOSP 3.4 tree here: git://git.linaro.org/people/jstultz/android.git linaro-android-3.4
Andrey: Probably you're call on this. If you've already merged in my rebase tree it should be fine for 12.04, but if not you might want to jump over to the AOSP 3.4 tree.
Hi John, No, not merged your rebase tree yet (still busy with the script to produce the linux-linaro-tracking tree). Will use your linaro-android-3.4 branch for 12.04. Thanks a lot for your efforts!
Does this mean the 12.04 release is going to be 3.4 based? If so, let us know when you don't need 3.3 topic branches any more so we can move them over to 3.4. (E.g. one of the ARM LT's 3.3 topics is now in mainline 3.4 but in a slightly changed form, so we need to drop the topic rather than have merge conflicts between he two versions.)
Hi Jon,
On 04/12/2012 12:54 PM, Jon Medhurst (Tixy) wrote:
On Wed, 2012-04-11 at 23:29 +0400, Andrey Konovalov wrote:
On 04/11/2012 11:19 PM, John Stultz wrote:
On 04/09/2012 03:18 PM, John Stultz wrote:
I went ahead and forward ported the AOSP-3.3 tree to 3.4-rc1.
You can grab it here: git://git.linaro.org/people/jstultz/android.git linaro-android-3.4-jstultz-rebase
Sigh. Looks like the Google devs are following close behind and released their own 3.4-rc2 based tree.
Don't get me wrong: Its great to see them keeping up with mainline, but I've clearly duplicated their work this cycle.
I've gone ahead and mirrored the AOSP 3.4 tree here: git://git.linaro.org/people/jstultz/android.git linaro-android-3.4
Andrey: Probably you're call on this. If you've already merged in my rebase tree it should be fine for 12.04, but if not you might want to jump over to the AOSP 3.4 tree.
Hi John, No, not merged your rebase tree yet (still busy with the script to produce the linux-linaro-tracking tree). Will use your linaro-android-3.4 branch for 12.04. Thanks a lot for your efforts!
Does this mean the 12.04 release is going to be 3.4 based? If so, let us know when you don't need 3.3 topic branches any more so we can move them over to 3.4. (E.g. one of the ARM LT's 3.3 topics is now in mainline 3.4 but in a slightly changed form, so we need to drop the topic rather than have merge conflicts between he two versions.)
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.
Thanks, Andrey
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.
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?
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
Hi John
When using the linaro-android-3.4 branch the mouse buttons don't seem to work. I've tracked the problem down to something you fixed in linaro-android-3.4-jstultz-rebase, namely: http://git.linaro.org/gitweb?p=people/jstultz/android.git%3Ba=commit%3Bh=2d5...
Can you add this to linaro-android-3.4 and any other fixes you did that might be missing?
Cheers
On 04/13/2012 03:22 AM, Jon Medhurst (Tixy) wrote:
Hi John
When using the linaro-android-3.4 branch the mouse buttons don't seem to work. I've tracked the problem down to something you fixed in linaro-android-3.4-jstultz-rebase, namely: http://git.linaro.org/gitweb?p=people/jstultz/android.git%3Ba=commit%3Bh=2d5...
Can you add this to linaro-android-3.4 and any other fixes you did that might be missing?
Just re-added that one. Thanks for pointing it out, sorry for making you chase it down.
thanks -john
Hi John
On 11/04/12 20:19, John Stultz wrote:
On 04/09/2012 03:18 PM, John Stultz wrote:
I went ahead and forward ported the AOSP-3.3 tree to 3.4-rc1.
You can grab it here: git://git.linaro.org/people/jstultz/android.git linaro-android-3.4-jstultz-rebase
Sigh. Looks like the Google devs are following close behind and released their own 3.4-rc2 based tree.
Don't get me wrong: Its great to see them keeping up with mainline, but I've clearly duplicated their work this cycle.
I've gone ahead and mirrored the AOSP 3.4 tree here: git://git.linaro.org/people/jstultz/android.git linaro-android-3.4
Are you going to add "merge_config.sh" into this branch?
Andrey: Probably you're call on this. If you've already merged in my rebase tree it should be fine for 12.04, but if not you might want to jump over to the AOSP 3.4 tree.
thanks -john
linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
On 04/13/2012 02:48 PM, Sangwook Lee wrote:
Hi John
On 11/04/12 20:19, John Stultz wrote:
On 04/09/2012 03:18 PM, John Stultz wrote:
I went ahead and forward ported the AOSP-3.3 tree to 3.4-rc1.
You can grab it here: git://git.linaro.org/people/jstultz/android.git linaro-android-3.4-jstultz-rebase
Sigh. Looks like the Google devs are following close behind and released their own 3.4-rc2 based tree.
Don't get me wrong: Its great to see them keeping up with mainline, but I've clearly duplicated their work this cycle.
I've gone ahead and mirrored the AOSP 3.4 tree here: git://git.linaro.org/people/jstultz/android.git linaro-android-3.4
Are you going to add "merge_config.sh" into this branch?
merge_config.sh is in linaro-configs-3.4 on John's tree. The related patches have also been part of topic/base.
Andrey: Probably you're call on this. If you've already merged in my rebase tree it should be fine for 12.04, but if not you might want to jump over to the AOSP 3.4 tree.
thanks -john
linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
On 04/13/2012 04:19 PM, Tushar Behera wrote:
On 04/13/2012 02:48 PM, Sangwook Lee wrote:
Hi John
On 11/04/12 20:19, John Stultz wrote:
On 04/09/2012 03:18 PM, John Stultz wrote:
I went ahead and forward ported the AOSP-3.3 tree to 3.4-rc1.
You can grab it here: git://git.linaro.org/people/jstultz/android.git linaro-android-3.4-jstultz-rebase
Sigh. Looks like the Google devs are following close behind and released their own 3.4-rc2 based tree.
Don't get me wrong: Its great to see them keeping up with mainline, but I've clearly duplicated their work this cycle.
I've gone ahead and mirrored the AOSP 3.4 tree here: git://git.linaro.org/people/jstultz/android.git linaro-android-3.4
Are you going to add "merge_config.sh" into this branch?
merge_config.sh is in linaro-configs-3.4 on John's tree. The related patches have also been part of topic/base.
I mean topic/base in Samsung's Landing team kernel.
Andrey: Probably you're call on this. If you've already merged in my rebase tree it should be fine for 12.04, but if not you might want to jump over to the AOSP 3.4 tree.
thanks -john
linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
On 13 April 2012 12:01, Tushar Behera tushar.behera@linaro.org wrote:
On 04/13/2012 04:19 PM, Tushar Behera wrote:
On 04/13/2012 02:48 PM, Sangwook Lee wrote:
Hi John
On 11/04/12 20:19, John Stultz wrote:
On 04/09/2012 03:18 PM, John Stultz wrote:
I went ahead and forward ported the AOSP-3.3 tree to 3.4-rc1.
You can grab it here: git://git.linaro.org/people/jstultz/android.git linaro-android-3.4-jstultz-rebase
Sigh. Looks like the Google devs are following close behind and
released
their own 3.4-rc2 based tree.
Don't get me wrong: Its great to see them keeping up with mainline, but I've clearly duplicated their work this cycle.
I've gone ahead and mirrored the AOSP 3.4 tree here: git://git.linaro.org/people/jstultz/android.git linaro-android-3.4
Are you going to add "merge_config.sh" into this branch?
merge_config.sh is in linaro-configs-3.4 on John's tree. The related patches have also been part of topic/base.
I mean topic/base in Samsung's Landing team kernel.
Thanks for info.
Andrey: Probably you're call on this. If you've already merged in my rebase tree it should be fine for 12.04, but if not you might want to jump over to the AOSP 3.4 tree.
thanks -john
linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
-- Tushar Behera
-
Andrey Konovalov -
John Stultz -
John Stultz -
Jon Medhurst (Tixy) -
Sangwook Lee -
Tushar Behera