GitLab

This merges '5b726e06

' into drm-next

Just to resolve some merges to make Daniel's life easier.
Signed-off-by: DAve Airlie <airlied@redhat.com>