The patch below does not apply to the 6.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-6.10.y git checkout FETCH_HEAD git cherry-pick -x e33697141bac18906345ea46533a240f1ad3cd21 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024081258-femur-antonym-2836@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^.. Possible dependencies: e33697141bac ("drm/amd/display: Solve mst monitors blank out problem after resume") 1ff6631baeb1 ("drm/amd/display: Prevent IPX From Link Detect and Set Mode") f63f86b5affc ("drm/amd/display: Separate setting and programming of cursor") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
