Merge drm-fixes into drm-next.

Nouveau wanted this to avoid some worse conflicts when I merge that.