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 c2bc958b2b03e361f14df99983bc64a39a7323a3 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024072951-greeter-mummy-752b@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: c2bc958b2b03 ("fbdev: vesafb: Detect VGA compatibility from screen info's VESA attributes") 75fa9b7e375e ("video: Add helpers for decoding screen_info") 3218286bbb78 ("fbdev/vesafb: Replace references to global screen_info by local pointer") 7470849745e6 ("video: Move HP PARISC STI core code to shared location") 93604a5ade3a ("fbdev: Handle video= parameter in video/cmdline.c") 367221793d47 ("fbdev: Move option-string lookup into helper") 6d8ad3406a69 ("fbdev: Unexport fb_mode_option") cedaf7cddd73 ("fbdev: Support NULL for name in option-string lookup") 73ce73c30ba9 ("fbdev: Transfer video= option strings to caller; clarify ownership") 678573b8eee2 ("fbdev/vesafb: Do not use struct fb_info.apertures") 4ef614be6557 ("fbdev/vesafb: Remove trailing whitespaces") 9a758d8756da ("drm: Move nomodeset kernel parameter to drivers/video") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
