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 0289507609dcb7690e45e79fbcc3680d9298ec77 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024100816-recliner-obnoxious-a8b7@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^.. Possible dependencies: 0289507609dc ("drm/i915/bios: fix printk format width") 9aec6f76a28c ("drm/i915/bios: convert to struct intel_display") 769b081c18b9 ("drm/i915/opregion: convert to struct intel_display") b7f317e62968 ("drm/i915/opregion: unify intel_encoder/intel_connector naming") f7303ab29d08 ("drm/i915/acpi: convert to struct intel_display") 4c288f56030f ("drm/i915/bios: remove stale and useless comments") 6f4e43a2f771 ("drm/xe: Fix opregion leak") bc3ca4d94369 ("drm/i915: Make I2C terminology more inclusive") fd5a9b950ea8 ("drm/i915/fbc: Convert to intel_display, mostly") bc34d310b578 ("drm/i915/fbc: Extract intel_fbc_has_fences()") d754ed2821fd ("Merge drm/drm-next into drm-intel-next") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
