linux-kernel - linux-next: manual merge of the sound-asoc tree with the slave-dma 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>] [day] [month] [year] [list]

Date:	Mon, 5 Mar 2012 13:59:49 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Liam Girdwood <lrg@...com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Vinod Koul <vinod.koul@...el.com>,
	Sascha Hauer <s.hauer@...gutronix.de>,
	Lars-Peter Clausen <lars@...afoo.de>
Subject: linux-next: manual merge of the sound-asoc tree with the slave-dma
 tree

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in
sound/soc/imx/imx-pcm-dma-mx2.c between commit c0fa6c8af7ab ("ASoC: i.MX:
Add missing dma_async_issue_pending") from the slave-dma tree and commit
c307e8e32e11 ("ASoC: imx-pcm-dma: Use dmaengine PCM helper functions")
from the sound-asoc tree.

The latter removed the code modified by the former, so hopefully the
former change is subsumed into the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped