linux-kernel - Re: linux-next: manual merge of the slave-dma tree with the sound tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120322134101.e2342db0ae13a4ed79cfebfd@canb.auug.org.au>
Date:	Thu, 22 Mar 2012 13:41:01 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Vinod Koul <vinod.koul@...el.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alexandre Bounine <alexandre.bounine@....com>,
	Lars-Peter Clausen <lars@...afoo.de>,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Takashi Iwai <tiwai@...e.de>
Subject: Re: linux-next: manual merge of the slave-dma tree with the sound
 tree

On Thu, 22 Mar 2012 13:39:30 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the slave-dma tree got a conflict in
> sound/soc/imx/imx-pcm-dma-mx2.c between commit c307e8e32e11 ("ASoC:
> imx-pcm-dma: Use dmaengine PCM helper functions") from the sound tree and
> commit 16052827d98f ("dmaengine/dma_slave: introduce inline wrappers")
> from the slave-dma tree.
> 
> I just use dthe version from the sound tree.

The same with sound/soc/mxs/mxs-pcm.c .
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped