From: Sasha Levin Date: Mon, 4 Dec 2023 19:50:15 +0000 (-0500) Subject: Drop fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch-14283 X-Git-Tag: v4.14.332~23^2~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a210754fdd12c4af5db88367164f3b19d3e650b;p=thirdparty%2Fkernel%2Fstable-queue.git Drop fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch-14283 Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch-14283 b/queue-6.1/fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch-14283 deleted file mode 100644 index 271bde33620..00000000000 --- a/queue-6.1/fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch-14283 +++ /dev/null @@ -1,39 +0,0 @@ -From 2c88833bba061e302bcc2f6ded10d3c6a27b68b6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 27 Oct 2023 13:36:48 +0200 -Subject: fbdev: stifb: Make the STI next font pointer a 32-bit signed offset - -From: Helge Deller - -[ Upstream commit 8a32aa17c1cd48df1ddaa78e45abcb8c7a2220d6 ] - -The pointer to the next STI font is actually a signed 32-bit -offset. With this change the 64-bit kernel will correctly subract -the (signed 32-bit) offset instead of adding a (unsigned 32-bit) -offset. It has no effect on 32-bit kernels. - -This fixes the stifb driver with a 64-bit kernel on qemu. - -Signed-off-by: Helge Deller -Cc: stable@vger.kernel.org -Signed-off-by: Sasha Levin ---- - drivers/video/fbdev/sticore.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/video/fbdev/sticore.h b/drivers/video/fbdev/sticore.h -index 0ebdd28a0b813..d83ab3ded5f3d 100644 ---- a/drivers/video/fbdev/sticore.h -+++ b/drivers/video/fbdev/sticore.h -@@ -231,7 +231,7 @@ struct sti_rom_font { - u8 height; - u8 font_type; /* language type */ - u8 bytes_per_char; -- u32 next_font; -+ s32 next_font; /* note: signed int */ - u8 underline_height; - u8 underline_pos; - u8 res008[2]; --- -2.42.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 344b957ec45..b2129c05454 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -92,7 +92,6 @@ iommu-vt-d-add-device_block_translation-helper.patch iommu-vt-d-disable-pci-ats-in-legacy-passthrough-mod.patch iommu-vt-d-make-context-clearing-consistent-with-con.patch drm-amd-pm-fix-a-memleak-in-aldebaran_tables_init.patch -fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch-14283 spi-fix-null-dereference-on-suspend.patch-13256 drm-amd-display-restore-rptr-wptr-for-dmcub-as-worka.patch-32587 drm-amd-display-guard-against-invalid-rptr-wptr-bein.patch-19687