linux-kernel - linux-next: manual merge of the sound-asoc tree with the l2-mtd 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]

Message-Id: <20120305140417.e55b7f1f0f0a9280dcb73040@canb.auug.org.au>
Date:	Mon, 5 Mar 2012 14:04:17 +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,
	Huang Shijie <b32955@...escale.com>,
	Artem Bityutskiy <dedekind1@...il.com>,
	Lars-Peter Clausen <lars@...afoo.de>
Subject: linux-next: manual merge of the sound-asoc tree with the l2-mtd
 tree

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in
sound/soc/mxs/mxs-pcm.h between commit 7079e020563c ("mxs-dma : move the
mxs dma.h to a more common place") from the l2-mtd tree and commit
016ab467aa53 ("ASoC: mxs-pcm: Use dmaengine PCM helper functions") from
the sound-asoc tree.

The latter seems to remove the need for the include updated by the
former, so I removed it.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped