linux-kernel - Re: 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20131203164824.GG27568@sirena.org.uk>
Date:	Tue, 3 Dec 2013 16:48:24 +0000
From:	Mark Brown <broonie@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Liam Girdwood <lgirdwood@...il.com>,
	Vinod Koul <vinod.koul@...el.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Nicolin Chen <b42378@...escale.com>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the
 slave-dma tree

On Tue, Dec 03, 2013 at 11:38:52AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the sound-asoc tree got a conflict in
> sound/soc/fsl/fsl_ssi.c between commit bf02c7cb4314 ("ASoC: fsl_ssi: Add
> dual fifo mode support") from the slave-dma tree and commit 2924a9981006
> ("ASoC: fsl_ssi: Add monaural audio support for non-ac97 interface") from
> the sound-asoc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me, thanks.

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)