The patch below does not apply to the 6.9-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.9.y git checkout FETCH_HEAD git cherry-pick -x 4a5b171299e59d51322f4c6bd376c5acbeca0a4a # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024061921-hardcover-jubilance-30ec@gregkh' --subject-prefix 'PATCH 6.9.y' HEAD^.. Possible dependencies: 4a5b171299e5 ("drm/amd/display: always reset ODM mode in context when adding first plane") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
