[alsa-devel] i.MX SDMA support

[Mark Brown]

On 9 Aug 2010, at 13:19, Sascha Hauer <s.hauer at pengutronix.de> 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.
>>