From: Dave Airlie <airlied@redhat.com>
Date: Tue, 15 May 2018 09:25:07 +0000 (+1000)
Subject: Merge tag 'drm-misc-next-2018-05-15' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Tag: v4.18-rc1~128^2~14
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4

Merge tag 'drm-misc-next-2018-05-15' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for v4.18:

UAPI Changes:
- Fix render node number regression from control node removal.

Driver Changes:
- Small header fix for virgl, used by qemu.
- Use vm_fault_t in qxl.

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

# gpg: Signature made Tue 15 May 2018 06:16:03 PM AEST
# gpg:                using RSA key FE558C72A67013C3
# gpg: Can't check signature: public key not found
Link: https://patchwork.freedesktop.org/patch/msgid/e63306b9-67a0-74ab-8883-08b3d9db72d2@mblankhorst.nl
---

2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4