From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Aug 2025 03:43:20 +0000 (+0300)
Subject: Merge tag 'fbdev-for-6.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2939a792c47e55fda4ae5b7f9ff47e34ddcef61a;p=linux-block.git

Merge tag 'fbdev-for-6.17-rc1-2' of git://git./linux/kernel/git/deller/linux-fbdev

Pull fbdev fixes for 6.17-rc1:

 - Revert a patch which broke VGA console

 - Fix an out-of-bounds access bug which may happen during console
   resizing when a console is mapped to a frame buffer

* tag 'fbdev-for-6.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
  Revert "vgacon: Add check for vc_origin address range in vgacon_scroll()"
  fbdev: Fix vmalloc out-of-bounds write in fast_imageblit
---

2939a792c47e55fda4ae5b7f9ff47e34ddcef61a