Merge tag 'doc-4.11-images' of git://git.lwn.net/linux into drm-misc-next

Pointer for Markus's image conversion work.

We need this so we can merge all the pretty drm graphs for 4.12.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/dma-buf/dma-fence.c
Simple merge

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

diff --cc drivers/gpu/drm/drm_mode_object.c
index 2eb0792dfaf3508a0eabe7008bfabf3f2f4fc2b6,220a6c1f4ab95c26396a944481fc8f897d844f8d..da9a9adbcc9857ec37f9fa75e48bbc7a6ed1d283
--- 1/drivers/gpu/drm/drm_mode_object.c
--- 2/drivers/gpu/drm/drm_mode_object.c
+++ b/drivers/gpu/drm/drm_mode_object.c
@@@ -151,12 -155,12 +151,12 @@@ EXPORT_SYMBOL(drm_mode_object_find)
   *
   * This function decrements the object's refcount if it is a refcounted modeset
   * object. It is a no-op on any other object. This is used to drop references
 - * acquired with drm_mode_object_reference().
 + * acquired with drm_mode_object_get().
   */
 -void drm_mode_object_unreference(struct drm_mode_object *obj)
 +void drm_mode_object_put(struct drm_mode_object *obj)
  {
        if (obj->free_cb) {
-               DRM_DEBUG("OBJ ID: %d (%d)\n", obj->id, atomic_read(&obj->refcount.refcount));
+               DRM_DEBUG("OBJ ID: %d (%d)\n", obj->id, kref_read(&obj->refcount));
                kref_put(&obj->refcount, obj->free_cb);
        }
  }
@@@ -168,12 -172,12 +168,12 @@@ EXPORT_SYMBOL(drm_mode_object_put)
   *
   * This function increments the object's refcount if it is a refcounted modeset
   * object. It is a no-op on any other object. References should be dropped again
 - * by calling drm_mode_object_unreference().
 + * by calling drm_mode_object_put().
   */
 -void drm_mode_object_reference(struct drm_mode_object *obj)
 +void drm_mode_object_get(struct drm_mode_object *obj)
  {
        if (obj->free_cb) {
-               DRM_DEBUG("OBJ ID: %d (%d)\n", obj->id, atomic_read(&obj->refcount.refcount));
+               DRM_DEBUG("OBJ ID: %d (%d)\n", obj->id, kref_read(&obj->refcount));
                kref_get(&obj->refcount);
        }
  }

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

diff --cc drivers/gpu/drm/gma500/framebuffer.c
Simple merge

diff --cc drivers/gpu/drm/gma500/psb_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_irq.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_drv.h
Simple merge

diff --cc drivers/gpu/drm/msm/msm_drv.h
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_drv.h
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_gem.c
Simple merge

diff --cc drivers/gpu/drm/rockchip/cdn-dp-core.c
Simple merge

diff --cc drivers/gpu/drm/tinydrm/mipi-dbi.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_bo.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_gem.c
Simple merge

diff --cc drivers/gpu/drm/vgem/vgem_drv.c
Simple merge

diff --cc drivers/of/platform.c
Simple merge

diff --cc include/drm/drm_edid.h
Simple merge

diff --cc include/drm/drm_framebuffer.h
Simple merge

diff --cc include/drm/drm_mm.h
Simple merge