Merge 4.3-rc3 into staging-next

We want the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/fbtft/fb_uc1611.c
index 5b836614afe8e4f6ed832c55b3ceed0e21a5ca4f,5cafa50d1facee4292916852274f3bfa8aff8281..c9bbba1e1a5d954768441ac9697ba22066229668
--- 1/drivers/staging/fbtft/fb_uc1611.c
--- 2/drivers/staging/fbtft/fb_uc1611.c
+++ b/drivers/staging/fbtft/fb_uc1611.c
@@@ -72,9 -72,11 +72,9 @@@ static int init_display(struct fbtft_pa
  {
        int ret;
  
 -      fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
 -
        /* Set CS active high */
        par->spi->mode |= SPI_CS_HIGH;
-       ret = par->spi->master->setup(par->spi);
+       ret = spi_setup(par->spi);
        if (ret) {
                dev_err(par->info->device, "Could not set SPI_CS_HIGH\n");
                return ret;

diff --cc drivers/staging/fbtft/fb_watterott.c
Simple merge

diff --cc drivers/staging/fbtft/fbtft-core.c
Simple merge

diff --cc drivers/staging/fbtft/flexfb.c
Simple merge