Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm...
authorDave Airlie <airlied@redhat.com>
Tue, 10 Jul 2018 00:45:04 +0000 (10:45 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 10 Jul 2018 00:45:14 +0000 (10:45 +1000)
Lucas wrote:
"a couple of small fixes:
- 2 patches from Fabio to fix module reloading
- one patch to fix a userspace visible regression, where the job
timeout is a bit too eager and kills legitimate jobs"

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1530868450.15725.8.camel@pengutronix.de

Trivial merge