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
| ||
|
Date: Mon, 21 Nov 2011 11:08:37 +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,
Thomas Abraham <thomas.abraham@...aro.org>,
Kukjin Kim <kgene.kim@...sung.com>
Subject: linux-next: manual merge of the slave-dma tree with the s5p tree
Hi Vinod,
Today's linux-next merge of the slave-dma tree got a conflict in
drivers/dma/pl330.c between commit fc0b5cccc8dd ("DMA: PL330: Infer
transfer direction from transfer request instead of platform data") from
the s5p tree and commit db8196df4bb6 ("dmaengine: move drivers to
dma_transfer_direction") from the slave-dma tree.
The former removed the code modified by the latter, so I did that.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists