Merge drm/drm-fixes into drm-misc-fixes

Backmerging to get latest upstream.

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

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

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

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

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

diff --cc drivers/gpu/drm/virtio/virtgpu_vq.c
Simple merge

diff --cc drivers/video/fbdev/core/fb_defio.c
Simple merge

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

diff --cc include/linux/fb.h
Simple merge