Preliminary 12.04 linux-linaro kernel tree
Andrey Konovalov
andrey.konovalov at linaro.org
Wed Apr 18 20:22:23 UTC 2012
Greetings,
I updated (overwrote) the current linux-linaro tree
(git://git.linaro.org/kernel/linux-linaro-tracking.git , linux-linaro
branch).
Changes to the previous version:
* topics merge order changed: generic topics first, LT's topics last:
-----8<-----
integration linux-linaro v3.4-rc3 ufs emmc thermal_exynos4_imx6
linaro-android-3.4 unsorted linaro-configs-3.4 armlt-hdlcd armlt-mmc
armlt-arm-arch-fixes armlt-misc-fixes armlt-ubuntu-config
armlt-android-config armlt-gator samslt-base samslt-core samslt-bl
samslt-dt samslt-fb samslt-pd samslt-s2ram samslt-asv_cpufreq
thermal_exynos4_imx6 samslt-led samslt-dummy_reg samslt-gadget
samslt-touch samslt-wlan samslt-audio samslt-hdmi samslt-mali
samslt-cma_v24 samslt-android_config
-----8<-----
* Added tracking-linaro-android-3.4 topic:
topic linaro-android-3.4 merge android_jstultz/linaro-android-3.4
* Added the fix from Samsung LT: no more build failures due to Mali and
UMP on targets which don't have these devices.
* samslt-rtc topic removed (it is in v3.4-rc3 already).
* samslt-android_configtopic added.
* omap4_defconfig added. Based on omap4_defconfig from 12.03
linux-linaro release. Doesn't belong to any topic yet, will go into the
unsorted topic on the next linux-linaro update.
Not included are the following topics present in the 12.03 release:
* tracking-linaro_cpuidle: there are conflicts when rebasing it to
v3.4-rc3. The topic owner has been notified, and should tell me how to
proceed. Or update the topic for v3.4-rc3.
* the replacement for tracking-umm-3.3-wip (tracking-umm-3.4-rc3-wip
probaly): haven't received the v3.4-rcX version so far.
Minimal boot test has been passed on the panda, though I had to
use CONFIG_CLK_REG_CPUFREQ_DRIVER instead of
CONFIG_ARM_OMAP2PLUS_CPUFREQ for the board to boot. Not sure if this is
the right thing to do. Android testing is TBD.
Thanks,
Andrey
On 04/18/2012 02:16 AM, Andrey Konovalov wrote:
> Greetings,
>
> I've pushed the current linux-linaro tree
> to git://git.linaro.org/kernel/linux-linaro-tracking.git , linux-linaro
> branch.
>
> This is still work in progress, and it misses few topics. But due to
> limited access to hardware at the moment it would be good to try it
> sooner than later on vexpress and origen at least. (I have only panda on
> hand). Minimal boot test has been passed on the panda, though I had to
> disable CPUFREQ for the board to boot (haven't looked deeper yet).
>
> Not included are the following topics present in the 12.03 release:
> * tracking-linaro_cpuidle: there are conflicts when rebasing it to
> v3.4-rc3. The topic owner has been notified, and should tell me how to
> proceed.
> * tracking-umm-3.3-wip: this one seems to be in v3.4-rc3 mainline tree,
> correct?
> * tracking-linaro-android-3.4: I've tried it with a smaller subset of
> the topics (w/o LT's ones), and it merged ok, but there are some
> conflicts with the LT's stuff as it seems. Will have a deeper look
> tomorrow. No action from John is required at the moment.
>
> Here is the list of the topic included into this tree currently:
> # integration <name> <base> <topic1> <topic2> ... <topicN>
> # - the merge order is <topic1> to <topicN>.
> integration linux-linaro v3.4-rc3 ufs emmc thermal_exynos4_imx6
> linaro-configs-3.4 armlt-hdlcd armlt-mmc armlt-arm-arch-fixes
> armlt-misc-fixes armlt-ubuntu-config armlt-android-config armlt-gator
> samslt-base samslt-core samslt-bl samslt-dt samslt-fb samslt-pd
> samslt-rtc samslt-s2ram samslt-asv_cpufreq thermal_exynos4_imx6
> samslt-led samslt-dummy_reg samslt-gadget samslt-touch samslt-wlan
> samslt-audio samslt-hdmi samslt-mali samslt-cma_v24 unsorted
>
> Where the topics are:
> # topic <local branch> <remote/branch> <topic base>
> # - <base> must be another topic
> # Example1: tracking-armlt-gator lt_arm/tracking-armlt-gator
> # - missing <topic base> here assumes the mainline Linus tree.
> #
> # ARM LT topics:
> topic armlt-hdlcd lt_arm/tracking-armlt-hdlcd
> topic armlt-mmc lt_arm/tracking-armlt-mmc
> topic armlt-arm-arch-fixes lt_arm/tracking-armlt-arm-arch-fixes
> topic armlt-misc-fixes lt_arm/tracking-armlt-misc-fixes
> topic armlt-ubuntu-config lt_arm/tracking-armlt-ubuntu-config
> topic armlt-android-config lt_arm/tracking-armlt-android-config
> topic armlt-gator lt_arm/tracking-armlt-gator
> #
> topic ufs svenkatr/ufs-for-linux-linaro
> topic emmc svenkatr/emmc-for-linux-linaro
> topic thermal_exynos4_imx6 amitdanielk/thermal_exynos4_imx6_work
> topic unsorted ynk/tracking-orphan-unsorted
> # Samsung LT topics:
> topic samslt-base lt_samsung/topic/base
> topic samslt-asv_cpufreq lt_samsung/topic/asv_cpufreq samslt-base
> topic samslt-audio lt_samsung/topic/audio samslt-base
> topic samslt-bl lt_samsung/topic/bl samslt-base
> topic samslt-cma_v24 lt_samsung/topic/cma_v24 samslt-base
> topic samslt-core lt_samsung/topic/core samslt-base
> topic samslt-dt lt_samsung/topic/dt samslt-base
> topic samslt-dummy_reg lt_samsung/topic/dummy_reg samslt-base
> topic samslt-fb lt_samsung/topic/fb samslt-base
> topic samslt-gadget lt_samsung/topic/gadget samslt-base
> topic samslt-hdmi lt_samsung/topic/hdmi samslt-base
> topic samslt-led lt_samsung/topic/led samslt-base
> topic samslt-mali lt_samsung/topic/mali samslt-base
> topic samslt-pd lt_samsung/topic/pd samslt-base
> topic samslt-rtc lt_samsung/topic/rtc samslt-base
> topic samslt-s2ram lt_samsung/topic/s2ram samslt-base
> topic samslt-touch lt_samsung/topic/touch samslt-base
> topic samslt-wlan lt_samsung/topic/wlan samslt-base
>
> And the remotes are:
> #
> # remote <remote name> <remote URL>
> #
> remote lt_arm git://git.linaro.org/landing-teams/working/arm/kernel.git
> remote pmg_rob_lee git://git.linaro.org/people/rob_lee/linux.git
> remote svenkatr git://github.com/svenkatr/linux.git
> remote amitdanielk git://git.linaro.org/people/amitdanielk/linux.git
> remote android_jstultz git://git.linaro.org/people/jstultz/android.git
> remote ynk git://git.linaro.org/people/ynk/linux-linaro-tracking.git
> remote upstream
> git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
> remote lt_samsung
> git://git.linaro.org/landing-teams/working/samsung/kernel.git
>
> Thanks,
> Andrey
More information about the linaro-dev
mailing list