Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm...
authorDave Airlie <airlied@redhat.com>
Fri, 16 Aug 2019 02:43:12 +0000 (12:43 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 16 Aug 2019 02:43:21 +0000 (12:43 +1000)
A couple of independent patches extracted from the 5.3 pull request, fixed for
merge conflicts and a single unused variable warning.

And the drmP.h removal from Sam.

Signed-off-by: Dave Airlie <airlied@redhat.com>

Trivial merge