Merge branch 'drm-edid-fixes' into drm-core-next