Merge tag 'drm-misc-fixes-2018-06-21' of git://anongit.freedesktop.org/drm/drm-misc...
authorDave Airlie <airlied@redhat.com>
Thu, 21 Jun 2018 23:58:57 +0000 (09:58 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 22 Jun 2018 01:03:43 +0000 (11:03 +1000)
commitf3294568bbb19cbfc53451de192df6daae80f9b3
treea9edc98aa1ef92a0f03c0d4a743b5dd87a3c37c0
parent8325e6e36c239d5df2eecfb7983f49e0e6f5b2a7
parente8b92efa629dac0e70ea4145c5e70616de5f89c8
Merge tag 'drm-misc-fixes-2018-06-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

Fixes for v4.18-rc2:
- A reversion of a commit in drm/sun4i to fix a run-time fault.
- Various fixes to the sii8620 bridge.
- Small bugfix to correctly check stride in atmel-hlcdc.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/787d4bef-a579-4046-d0fc-f8c2c5b80c25@linux.intel.com
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
drivers/gpu/drm/sun4i/sun4i_tcon.c