The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 5aed213c7c6c4f5dcb1a3ef146f493f18fe703dc # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024073010-deserve-askew-b1bf@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 5aed213c7c6c ("drm/udl: Remove DRM_CONNECTOR_POLL_HPD") 0862cfd3e22f ("drm/udl: Move connector to modesetting code") 43858eb41e0d ("drm/udl: Various improvements to the connector") 2c1eafc40e53 ("drm/udl: Use USB timeout constant when reading EDID") c020f66013b6 ("drm/udl: Test pixel limit in mode-config's mode-valid function") 59a811faa74f ("drm/udl: Rename struct udl_drm_connector to struct udl_connector") 255490f9150d ("drm: Drop drm_edid.h from drm_crtc.h") 0f95ee9a0c57 ("Merge tag 'drm-misc-next-2022-06-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-next") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
