On Mon, Aug 09, 2010 at 03:09:44PM +0100, Mark Brown wrote: > On 9 Aug 2010, at 13:19, Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> wrote: > > > On Mon, Aug 09, 2010 at 11:47:03AM +0100, Liam Girdwood wrote: > >> > >> Yeah, that should be OK. However, we do have a ASoC core multi-component > >> update merging later this week. This may conflict with some of your SDMA > >> updates, although the multi-component support only really affects ASoC > >> component probe() and remove() as every component is a regular Linux > >> device now (with platform data, etc) and private data access. > > > > That won't be a problem. The SDMA code will wait until the next merge > > window anyway, I will rebase it after the multi-compoment merge if > > necessary. > > This is precisely the issue - multi component will go in 2.6.37 too, > meaning conflicts in -next unless one tree is pulled into the other > during the release cycle. Linus Walleij just proposed to implement the SDMA engine as part of the dmaengine API, so expect some delays here. I just looked at the i.MX part in the multi-component update and this is currently far from being in a working state, so there's still some work to do before thinking about possible conflicts... Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
