From: Dave Airlie <airlied@redhat.com>
Date: Tue, 6 Nov 2018 23:32:22 +0000 (+1000)
Subject: Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm... 
X-Git-Tag: v4.20-rc2~12^2~4
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=d99de699ac034ff1b706496a33f49bd7e1e8ae30

Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm-fixes

Single etnaviv fence fix for GPU recovery.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1541522424.2508.26.camel@pengutronix.de
---

d99de699ac034ff1b706496a33f49bd7e1e8ae30