[alsa-devel] davinci-i2c,pcm updates

[Kevin Hilman]

Mark Brown <broonie at opensource.wolfsonmicro.com> writes:

> On Mon, Jul 06, 2009 at 02:30:21PM -0700, Troy Kisky wrote:
>
>> ARM: DaVinci: Interface changes visible to EDMA clients
>
>> But the last patch in series needs rebased on to this. Unfortunately,
>> this patch is not yet in your for-2.6.32 branch. So, unless this patch
>> is going to merge first, I show remove the need for this patch???
>
> Unless you can make your changes such that the above patch will merge in
> cleanly there's no point - we'll need to deal with the cross tree merge
> issues somehow.  That'll require coordination with Kevin; probably the
> best approach is to make a small branch which can be merged into both
> trees but that may be too involved.

For now, how about making anything that has arch/arm dependencies
apply to the 'davinci-next' branch of DaVinci git.

Kevin