From 5c04573e316a90e0838d4c74d6a78fe280d88b3e Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 4 Dec 2023 14:51:01 -0500 Subject: [PATCH] Drop fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch-17578 Signed-off-by: Sasha Levin --- ...ti-next-font-pointer-a-32-bit-.patch-17578 | 39 ------------------- queue-5.15/series | 1 - 2 files changed, 40 deletions(-) delete mode 100644 queue-5.15/fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch-17578 diff --git a/queue-5.15/fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch-17578 b/queue-5.15/fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch-17578 deleted file mode 100644 index e017b3e2b6f..00000000000 --- a/queue-5.15/fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch-17578 +++ /dev/null @@ -1,39 +0,0 @@ -From c539321ecbf8b8022fc8dd5eb254b548696a427b 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-5.15/series b/queue-5.15/series index f0cb0a54a02..c9df95b1067 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -62,7 +62,6 @@ cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch iommu-vt-d-omit-devtlb-invalidation-requests-when-te.patch iommu-vt-d-make-context-clearing-consistent-with-con.patch smb3-fix-touch-h-of-symlink.patch-27885 -fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch-17578 fs-add-ctime-accessors-infrastructure.patch-279 smb3-fix-caching-of-ctime-on-setxattr.patch-25511 cpufreq-imx6q-don-t-warn-for-disabling-a-non-existin.patch-28374 -- 2.47.3