Hi, On Fri, Sep 21, 2012 at 9:53 AM, Shawn Guo <shawn.guo@xxxxxxxxxx> wrote: > On Sat, Sep 22, 2012 at 12:46:26AM +0800, Shawn Guo wrote: >> I just published the branch below with this series rebased on top of >> the necessary dependant branches. >> >> git://git.linaro.org/people/shawnguo/linux-2.6.git staging/imx-multiplatform >> >> The dependant branches include: >> > > Forgot the base: > > * arm-soc/next/multiplatform > > Shawn > >> * arm-soc/multiplatform/platform-data >> >> * arm-soc/multiplatform/smp_ops >> >> * git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-3.7 >> >> It contains dependant patch "ASoC: mx27vis: retrieve gpio numbers >> from platform_data" >> >> * git://git.infradead.org/mtd-2.6.git master >> >> The series is based on this tree to solve some non-trivial conflicts >> on mxc_nand driver. Because mtd tree completely missed 3.6 merge >> window, having the series base on 3.6-rc actually means 3.5 code base >> in term of mtd support. There are currently two cycles changes >> accumulated on mtd, and we need to base the series on it to sort out >> the conflicts. >> >> * git://linuxtv.org/mchehab/media-next.git master >> >> The media tree renames mx2/mx3 camera drivers twice. I'm not sure >> if git merge can detect them, so I just rebased the series on media >> tree to solve that. The bonus point is that a number of trivial >> conflicts with imx27-coda support on media tree gets solved as well. >> >> I'm not requesting you to pull the branch into arm-soc as a stable >> branch but staging one, because the external dependencies which might >> not be stable. I attempt to use it for exposing the series on >> linux-next, so that we can send it to Linus for 3.7 if there is chance >> for us to (e.g. all the dependant branches hit mainline early during >> 3.7 merge window). I've pulled this in now as staging/imx-multiplatform. As you mention, it might or might not make sense to send this up. It also accrued a few more merge conflicts with other branches in arm-soc, so we'll see how things play out. Either way, we'll for sure queue it for 3.8. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
