]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm...
authorDave Airlie <airlied@redhat.com>
Mon, 20 Jan 2020 04:16:32 +0000 (14:16 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 22 Jan 2020 23:20:04 +0000 (09:20 +1000)
vmwgfx updates + new logging uapi

https://patchwork.freedesktop.org/patch/349809/ is appropriate userpsace patch.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m=20=28VMware=29?=
Link: https://patchwork.freedesktop.org/patch/msgid/20200116092934.5276-1-thomas_os@shipmail.org

Trivial merge