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 for Android: free password hash cracker in your pocket

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

Date:	Mon, 26 Mar 2012 11:47:35 +0530
From:	Vinod Koul <vinod.koul@...ux.intel.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
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, 2012-03-22 at 13:41 +1100, Stephen Rothwell wrote:
> 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 .
Thanks Stephan, and sorry for delay in responding was away for the
weekend.

This should be fixed now with MArk applying the fix from Fabio Estevam.
I see this is in asoc-next.

-- 
~Vinod

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/