From: Dave Airlie Date: Tue, 24 Oct 2017 06:58:39 +0000 (+1000) Subject: Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm... X-Git-Tag: ceph-for-4.15-rc4~128^2~23 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fb9775aab2a79d09906f841ab8316379c20e5322;p=ceph-client.git Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next Disable perfmon ioctls for now in etnaviv * 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux: drm/etnaviv: short-circuit perfmon ioctls Revert "drm/etnaviv: submit supports performance monitor requests" --- fb9775aab2a79d09906f841ab8316379c20e5322