Merge drm/drm-next into drm-misc-next

Backmerging drm-next to sync with msm tree. Resolves a conflict
between aperture-helper changes and msm's use of those interfaces.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/msm/msm_drv.c
index aca48c8,b4cfa44..060c768
--- 1/drivers/gpu/drm/msm/msm_drv.c
--- 2/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@@ -449,7 -452,12 +452,12 @@@ static int msm_drm_init(struct device *
        /* Bind all our sub-components: */
        ret = component_bind_all(dev, ddev);
        if (ret)
-               goto err_drm_dev_put;
+               goto err_deinit_vram;
+ 
+       /* the fw fb could be anywhere in memory */
 -      ret = drm_aperture_remove_framebuffers(false, drv);
++      ret = drm_aperture_remove_framebuffers(drv);
+       if (ret)
+               goto err_msm_uninit;
  
        dma_set_max_seg_size(dev, UINT_MAX);
  

diff --cc drivers/gpu/drm/tegra/drm.c
Simple merge