Merge branch 'topic/err_reporting' into for-linus

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Conflicts:
	drivers/dma/cppi41.c

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

diff --cc drivers/dma/cppi41.c
index 97f4d6c1b6b9c16aa070ce512d95750e6f68963f,3b4c842b57201e9bccf523b59d35a20d57af98c7..bac5f023013b23c92519f052f8523b6008524271
--- 1/drivers/dma/cppi41.c
--- 2/drivers/dma/cppi41.c
+++ b/drivers/dma/cppi41.c
@@@ -336,11 -331,7 +336,11 @@@ static irqreturn_t cppi41_irq(int irq, 
  
                        c->residue = pd_trans_len(c->desc->pd6) - len;
                        dma_cookie_complete(&c->txd);
-                       c->txd.callback(c->txd.callback_param);
+                       dmaengine_desc_get_callback_invoke(&c->txd, NULL);
 +
 +                      /* Paired with cppi41_dma_issue_pending */
 +                      pm_runtime_mark_last_busy(cdd->ddev.dev);
 +                      pm_runtime_put_autosuspend(cdd->ddev.dev);
                }
        }
        return IRQ_HANDLED;

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

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

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

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

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

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

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