Re: [PATCH stable] drm/vc4: hdmi: Fix improper merge conflict with CEC