Greetings,
Moving to v3.4 release caused one conflict in drivers/dma/pl330.c when
merging the Samsung LT's topic/core. I've emailed the details to Tushar
for review.
My conflict resolutions didn't work for Origen, so the following fix has
been added (via the "last-minute-fixes" topic):
commit 774c3a28353943ee57c0e36c035cca98225b3000
"dma: dmaengine: Remove BUG_ON condition in dma_cookie_complete"
The new version is tagged linux-linaro-3.4-2012.05-1.
This commit is the only difference from linux-linaro-3.4-2012.05-0.
Thanks,
Andrey
On 05/21/2012 09:06 PM, Andrey Konovalov wrote:
Greetings,
Changes since last Friday, May 18:
* new ubuntu-sauce topic added
* new umm_fixes topic added (one patch from the Samsung LT to fix
kernel panic while booting Android on Origen board)
* the tree has been moved from v3.4-rc7 to v3.4 release
Moving to v3.4 release caused one conflict in drivers/dma/pl330.c when
merging the Samsung LT's topic/core. I've emailed the details to Tushar
for review.
Starting from today, the linux-linaro branch is frozen until the 12.05
release is out. Only important bug fixes would be accepted.
Here is the list of the topics included into the 12.05 linux-linaro tree:
Generic topics:
ufs (ufs-for-linux-linaro)
emmc (emmc-for-linux-linaro)
thermal_exynos4_imx6 (thermal_exynos4_imx6_work)
linaro-android-3.4
armlt-gator (tracking-armlt-gator)
umm-wip (umm-3.4rc4-wip)
unsorted (tracking-orphan-unsorted branch from
people/ynk/linux-linaro-tracking.git for the stuff that doesn't fit into
any existing topics)
linaro-configs-3.4
ubuntu-sauce (git://git.linaro.org/ubuntu/linux-linaro-quantal.git
linaro-ubuntu-sauce-packaging-topic)
ARM LT's topics:
tracking-armlt-hdlcd
tracking-armlt-mmc
tracking-armlt-arm-arch-fixes
tracking-armlt-misc-fixes (can be dropped actually, as these fixes are
in the mainline already - thanks, Tixy)
tracking-armlt-ubuntu-config
tracking-armlt-android-config
Samsung LT's topics:
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
llt/umm_fixes
last-minute-fixes topic:
- trivial fix to include/linux/dma-buf.h to make it compile in the
CONFIG_DMA_SHARED_BUFFER=n case
Thanks,
Andrey
_______________________________________________
linaro-dev mailing list
linaro-dev@lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-dev
