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

Backmerging from drm-next to get commit e24e6d69 ("drm/i915/display:
Implement fb_mmap callback function").

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