linux-next: manual merge of the slave-dma tree with the s5p tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgpXrK7kznzv_.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux