Merge tag 'vmwgfx-next-160520' of git://people.freedesktop.org/~thomash/linux into...