Merge tag 'drm-misc-fixes-2017-10-11' of git://anongit.freedesktop.org/drm/drm-misc...
authorDave Airlie <airlied@redhat.com>
Thu, 12 Oct 2017 00:38:09 +0000 (10:38 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 12 Oct 2017 00:38:09 +0000 (10:38 +1000)
commit545036a9944e9d6e50fed4ca03117147c880ff71
tree4af4bb0a2408c66ff77c5bf441a23ec4643cf81e
parent8a5776a5f49812d29fe4b2d0a2d71675c3facf3f
parentf7974880cf869ddbd0ba9a8e2ab11dff4a667f96
Merge tag 'drm-misc-fixes-2017-10-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

Core Changes:
- sync_file: Fix race in SYNC_IOC_FILE_INFO (John)
- atomic_helper: Give up reference taken in suspend helper (Jeffy)

Cc: John Einar Reitan <john.reitan@arm.com>
Cc: Jeffy Chen <jeffy.chen@rock-chips.com>
* tag 'drm-misc-fixes-2017-10-11' of git://anongit.freedesktop.org/drm/drm-misc:
  sync_file: Return consistent status in SYNC_IOC_FILE_INFO
  drm/atomic: Unref duplicated drm_atomic_state in drm_atomic_helper_resume()