Merge tag 'drm-misc-fixes-2019-01-10-1' of git://anongit.freedesktop.org/drm/drm...
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 11 Jan 2019 09:25:05 +0000 (10:25 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 11 Jan 2019 09:25:06 +0000 (10:25 +0100)
commit95681cda8dcc3e90f25b3e0c84c49778dae43346
tree9f0729370c868c3bbf26bfb0465119ebc3acf79b
parentae5e5ae90d32667e107ba0bd2f1dc9e20a08dfaf
parent4089e272ac61603931beb024d4d640de2cb390e0
Merge tag 'drm-misc-fixes-2019-01-10-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

Second pull request, drm-misc-fixes for v5.0-rc2:
- Fix fb-helper to work correctly with SDL 1.2 bugs.
- Fix lockdep warning in the atomic ioctl and setproperty.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2cf24f5c-2b1f-befa-8d08-058661146b61@linux.intel.com