fixup of conflicts in drm and msm