backmerge to get vmwgfx locking changes into next as the conflict with per-plane locking.
Attach a file by drag & drop or click to upload
