Merge tag 'drm-intel-fixes-2018-10-03' of git://anongit.freedesktop.org/drm/drm-intel...
authorDave Airlie <airlied@redhat.com>
Thu, 4 Oct 2018 00:04:38 +0000 (10:04 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 4 Oct 2018 00:07:20 +0000 (10:07 +1000)
commit659c9370e53c99b2e98eba0c07161f839dbf8521
treecb9f2ac651e4e8332a7608b067c668484f92fc71
parent77d981b16f2db81ba6c7792a9102652045535127
parent4c9613ce556fdeb671e779668b627ea3a2b61728
Merge tag 'drm-intel-fixes-2018-10-03' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

There's one fix for our zlib incomlete Z_FINISH on our error state handling,
plus a compilation warning fix and a tiny code clean up.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181003202840.GA23560@intel.com