Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull dmaengine changes from Dan

1/ Bartlomiej and Dan finalized a rework of the dma address unmap
   implementation.

2/ In the course of testing 1/ a collection of enhancements to dmatest
   fell out.  Notably basic performance statistics, and fixed / enhanced
   test control through new module parameters 'run', 'wait', 'noverify',
   and 'verbose'.  Thanks to Andriy and Linus for their review.

3/ Testing the raid related corner cases of 1/ triggered bugs in the
   recently added 16-source operation support in the ioatdma driver.

4/ Some minor fixes / cleanups to mv_xor and ioatdma.

Conflicts:
	drivers/dma/dmatest.c

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --cc drivers/dma/amba-pl08x.c
Simple merge

diff --cc drivers/dma/at_hdmac.c
Simple merge

diff --cc drivers/dma/dmaengine.c
Simple merge

diff --cc drivers/dma/dmatest.c
index 59e287f56dfca28bb0ff40fc79b6c0e612af58ac,329b7cf02f8ed9537a7b52c2576c83f93bcf3417..20f9a3aaf9266ea6daa71a18f08d258afa8a1a1e
--- 1/drivers/dma/dmatest.c
--- 2/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@@ -735,17 -633,17 +633,17 @@@ static int dmatest_func(void *data
                         * free it this time?" dancing.  For now, just
                         * leave it dangling.
                         */
-                       thread_result_add(info, result, DMATEST_ET_TIMEOUT,
-                                         total_tests, src_off, dst_off,
-                                         len, 0);
+                       dmaengine_unmap_put(um);
+                       result("test timed out", total_tests, src_off, dst_off,
+                              len, 0);
                        failed_tests++;
                        continue;
 -              } else if (status != DMA_SUCCESS) {
 +              } else if (status != DMA_COMPLETE) {
-                       enum dmatest_error_type type = (status == DMA_ERROR) ?
-                               DMATEST_ET_DMA_ERROR : DMATEST_ET_DMA_IN_PROGRESS;
-                       thread_result_add(info, result, type,
-                                         total_tests, src_off, dst_off,
-                                         len, status);
+                       dmaengine_unmap_put(um);
+                       result(status == DMA_ERROR ?
+                              "completion error status" :
+                              "completion busy status", total_tests, src_off,
+                              dst_off, len, ret);
                        failed_tests++;
                        continue;
                }

diff --cc drivers/dma/dw/core.c
Simple merge

diff --cc drivers/dma/fsldma.c
Simple merge

diff --cc drivers/dma/ioat/dma.c
Simple merge

diff --cc drivers/dma/ioat/dma_v3.c
Simple merge

diff --cc drivers/dma/iop-adma.c
Simple merge

diff --cc drivers/dma/mv_xor.c
Simple merge

diff --cc drivers/dma/pl330.c
Simple merge

diff --cc drivers/dma/ppc4xx/adma.c
Simple merge

diff --cc drivers/dma/txx9dmac.c
Simple merge

diff --cc include/linux/dmaengine.h
Simple merge