The patch below does not apply to the 6.1-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-6.1.y git checkout FETCH_HEAD git cherry-pick -x a2ccc33b88e2953a6bf0b309e7e8849cc5320018 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024083052-definite-customs-8a5e@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: a2ccc33b88e2 ("drm/i915/dp_mst: Fix MST state after a sink reset") e37137380931 ("drm/i915/dp_mst: Force modeset CRTC if DSC toggling requires it") 326b1e792ff0 ("drm/i915/dp_mst: Add the MST topology state for modesetted CRTCs") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
