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: <20120322133408.e4bc0b6030b0d8d244cde8bf@canb.auug.org.au>
Date:	Thu, 22 Mar 2012 13:34:08 +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>,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Takashi Iwai <tiwai@...e.de>,
	Lars-Peter Clausen <lars@...afoo.de>
Subject: linux-next: manual merge of the slave-dma tree with the sound tree

Hi Vinod,

Today's linux-next merge of the slave-dma tree got a conflict in
sound/soc/ep93xx/ep93xx-pcm.c between commit d7a42e1033b2 ("ASoC:
ep93xx-pcm: Use dmaengine PCM helper functions") from the sound tree and
commit 16052827d98f ("dmaengine/dma_slave: introduce inline wrappers")
from the slave-dma tree.

The former commit seems to have removed the need for the part of the
latter that affects this file.  I just used the version from the sound
tree.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au


Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ