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

[Stephen Rothwell]

Hi Dan,

Today's linux-next merge of the dmaengine tree got a conflict in
drivers/dma/dmatest.c between commit 19e9f99f273b ("dmaengine: dmatest:
use DMA_COMPLETE for dma completion status") from the slave-dma tree and
commit 872f05c6e9a3 ("dmatest: replace stored results mechanism, with
uniform messages") from the dmaengine tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/dma/dmatest.c
index 59e287f56dfc,329b7cf02f8e..000000000000
--- a/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;
                }

pgpDTpjnkpZsv.pgp
Description: PGP signature