Merge drm-fixes-for-v4.17-rc6-urgent into drm-next
authorDave Airlie <airlied@redhat.com>
Fri, 18 May 2018 04:08:53 +0000 (14:08 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 18 May 2018 04:08:53 +0000 (14:08 +1000)
commit1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0
treef829e8a26fc768666eb5f827bf5817892ea7e46c
parent315852b422972e6ebb1dfddaadada09e46a2681a
parent76ef6b28ea4f81c3d511866a9b31392caa833126
Merge drm-fixes-for-v4.17-rc6-urgent into drm-next

Need to backmerge some nouveau fixes to reduce
the nouveau -next conflicts a lot.

Signed-off-by: Dave Airlie <airlied@redhat.com>
MAINTAINERS
drivers/gpu/drm/amd/display/modules/color/color_gamma.c
drivers/gpu/drm/bridge/Kconfig
drivers/gpu/drm/drm_atomic.c
drivers/gpu/drm/vc4/vc4_plane.c