Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc drivers/spi/spi-dw.c
Simple merge

diff --cc drivers/spi/spi-fsl-dspi.c
Simple merge

diff --cc drivers/spi/spi-mem.c
Simple merge

diff --cc drivers/spi/spi-pxa2xx.c
index 69e874a2ad1e499aa62327253250386ff298c08f,3e82eaad0f2d913a6e1686f50dfa31d9680349f4..b6ddba833d021968858d22bd8cb6a7b55c08993e
--- 1/drivers/spi/spi-pxa2xx.c
--- 2/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@@ -1695,7 -1695,8 +1695,8 @@@ static int pxa2xx_spi_probe(struct plat
                        dev_dbg(dev, "no DMA channels available, using PIO\n");
                        platform_info->enable_dma = false;
                } else {
 -                      master->can_dma = pxa2xx_spi_can_dma;
 -                      master->max_dma_len = MAX_DMA_LEN;
 +                      controller->can_dma = pxa2xx_spi_can_dma;
++                      controller->max_dma_len = MAX_DMA_LEN;
                }
        }
  

diff --cc drivers/spi/spi-sprd.c
Simple merge