Merge branch 'topic/of' into for-linus

Conflicts:
	include/linux/dmaengine.h

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

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

diff --cc include/linux/dmaengine.h
index dd6d21b335c833eed6fa1e8cb6c7d6567071fe65,274071ca6f04584c8396c079655c4e2d8c6337a6..96d3e4ab11a91a4ea28d0f864d1cfbee6e249127
--- 1/include/linux/dmaengine.h
--- 2/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@@ -967,9 -967,8 +967,9 @@@ enum dma_status dma_sync_wait(struct dm
  #ifdef CONFIG_DMA_ENGINE
  enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx);
  void dma_issue_pending_all(void);
 -struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, dma_filter_fn fn, void *fn_param);
 +struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask,
 +                                      dma_filter_fn fn, void *fn_param);
- struct dma_chan *dma_request_slave_channel(struct device *dev, char *name);
+ struct dma_chan *dma_request_slave_channel(struct device *dev, const char *name);
  void dma_release_channel(struct dma_chan *chan);
  #else
  static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx)