Hi Tushar,
On 05/17/2012 01:06 PM, Tushar Behera wrote:
On 05/11/2012 01:04 AM, Andrey Konovalov wrote:
Samsung:
topic/base topic/core topic/bl topic/dt topic/fb topic/pd
topic/s2ram topic/asv_cpufreq topic/led topic/dummy_reg
topic/gadget topic/touch topic/wlan topic/audio topic/hdmi
topic/mali topic/cma_v24 topic/android_config
Following topic branches are available to be pulled to linux-linaro tree.
topic/base topic/core topic/bl topic/dt topic/fb topic/pd topic/s2ram
topic/asv_cpufreq topic/led topic/dummy_reg topic/gadget topic/touch
topic/wlan topic/audio topic/hdmi *topic/mfc* topic/mali
*topic/cma_origen* topic/android_config *topic/ubuntu_config*
These topics have been merged ok into the linux-linaro tree yesterday.
Thanks!
* topic/base is based on v3.4-rc7 and has config patches, both internal
and from John's linaro-config-3.4 branch. All other topic branches are
based on topic/base.
* topic/cma_v24 has been dropped. Instead we have topic/cma_origen that
has only Origen specific CMA patches.
With this set of patches, I can boot-test Ubuntu and it fails for
Android. I will update you if the Android related kernel panic is fixed
before 2012.05 release.
OK
Please let me know if you run across any issues while merging these
branches.
There were two simple conflicts when merging the topic/mali. The
solutions are attached for your reference.
Thanks,
Andrey
---
/home/ynk/git.linaro.org/lin-lin-tra.lltconfigs/solutions/886efb590db144743c71795a2849d19c/arch-arm-mach-exynos-mach-origen.c.orig
2012-05-17 21:15:42.247953580 +0400
+++ arch/arm/mach-exynos/mach-origen.c 2012-05-17 21:16:22.411954955 +0400
@@ -22,12 +22,9 @@
#include <linux/mfd/max8997.h>
#include <linux/lcd.h>
#include <linux/rfkill-gpio.h>
-<<<<<<< HEAD
#include <linux/ath6kl.h>
#include <linux/delay.h>
-=======
#include <linux/pm_domain.h>
->>>>>>> rebase-samslt-mali
#include <asm/mach/arch.h>
#include <asm/hardware/gic.h>
---
/home/ynk/git.linaro.org/lin-lin-tra.lltconfigs/solutions/886efb590db144743c71795a2849d19c/drivers-video-Kconfig.orig
2012-05-17 21:16:22.451954956 +0400
+++ drivers/video/Kconfig 2012-05-17 21:16:58.819956201 +0400
@@ -25,11 +25,8 @@ source "drivers/gpu/stub/Kconfig"
source "drivers/gpu/ion/Kconfig"
-<<<<<<< HEAD
-=======
source "drivers/gpu/arm/Kconfig"
->>>>>>> rebase-samslt-mali
config VGASTATE
tristate
default n
_______________________________________________
linaro-dev mailing list
linaro-dev@lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-dev
