Merge branch 'for-linus' into next

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

diff --cc drivers/dma/dw/core.c
index 4287c7c3b26cb5131b9aceae69b8c9622865ea43,41e9554b884d5bed629f0c6e8af8cf4ec792e55b..7067b6ddc1db6e7662f69bde5715639c479900d8
--- 1/drivers/dma/dw/core.c
--- 2/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@@ -1589,8 -1587,9 +1587,8 @@@ int dw_dma_probe(struct dw_dma_chip *ch
                goto err_pdata;
  
        INIT_LIST_HEAD(&dw->dma.channels);
-       for (i = 0; i < nr_channels; i++) {
+       for (i = 0; i < pdata->nr_channels; i++) {
                struct dw_dma_chan      *dwc = &dw->chan[i];
 -              int                     r = nr_channels - i - 1;
  
                dwc->chan.device = &dw->dma;
                dma_cookie_init(&dwc->chan);