Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm...
authorDave Airlie <airlied@redhat.com>
Tue, 7 Aug 2018 20:07:06 +0000 (06:07 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 7 Aug 2018 20:07:30 +0000 (06:07 +1000)
commit569f0a8694d0ff13c5d296a594c7d8cec8d6f35f
tree69f857858017a8b893429b63b28e09d2b60e5683
parenta7ccc5a43b829a96b4c62c0de71fc8c6fbd17b8a
parent5b147465532365dc4e2fee8499d6ca1f52dd0d16
Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next

From: Lucas Stach <l.stach@pengutronix.de>
"not much to de-stage this time. Changes from Philipp and Souptick to
use memset32 more and switch the fault handler to the new vm_fault_t
and two small fixes for issues that can be hit in rare corner cases
from me."

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1533563808.2809.7.camel@pengutronix.de
drivers/gpu/drm/etnaviv/etnaviv_gpu.c
drivers/gpu/drm/etnaviv/etnaviv_sched.c