OSDN Git Service

Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm...
authorDave Airlie <airlied@redhat.com>
Tue, 24 Oct 2017 06:58:39 +0000 (16:58 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 24 Oct 2017 06:58:39 +0000 (16:58 +1000)
commitfb9775aab2a79d09906f841ab8316379c20e5322
tree95c7edada5588c1ac3f5eece5047ee33c24dd738
parentfef1aa48f488fedbbecd28995f1fd9a2ea2a7ef2
parent330b52bd9bba1d66028772dfe08c053a34c5069a
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"