Merge branch '13'

2026-03-12 10:41:36 +01:00
parent a818cb9559 666247c81f
commit 896e19fe22
3 changed files with 36 additions and 0 deletions
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar 12 06:34:47 UTC 2026 - Jiri Slaby <jslaby@suse.cz>
+
+- add 0001-Linux-host-support-kernel-7.0.patch (bsc#1259536)
+
 -------------------------------------------------------------------
 Mon Feb 23 10:46:41 UTC 2026 - Jan Engelhardt <jengelh@inai.de>

@@ -134,6 +134,7 @@ Patch11:        cxx17.patch
 Patch12:        host-source.patch
 Patch20:        gentoo-C23.patch
 Patch21:        kernel-6.19.patch
+Patch22:        0001-Linux-host-support-kernel-7.0.patch
 #
 # Common BuildRequires for both virtualbox and virtualbox-kmp
 BuildRequires:  %{kernel_module_package_buildreqs}
@@ -0,0 +1,30 @@
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Thu, 12 Mar 2026 07:29:34 +0100
+Subject: Linux host: support kernel 7.0
+References: bsc#1259536
+Patch-mainline: Submitted https://github.com/VirtualBox/virtualbox/pull/583
+
+Fixes: https://github.com/VirtualBox/virtualbox/issues/582
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ src/VBox/Additions/linux/drm/vbox_fb.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c b/src/VBox/Additions/linux/drm/vbox_fb.c
+index 9f56b5a7259d..069c1a7aa56e 100644
+--- a/src/VBox/Additions/linux/drm/vbox_fb.c
+++ b/src/VBox/Additions/linux/drm/vbox_fb.c
+@@ -216,8 +216,10 @@ static struct fb_ops vboxfb_ops = {
+ 	.fb_pan_display = drm_fb_helper_pan_display,
+ 	.fb_blank = drm_fb_helper_blank,
+ 	.fb_setcmap = drm_fb_helper_setcmap,
+#if RTLNX_VER_MAX(7,0,0)
+ 	.fb_debug_enter = drm_fb_helper_debug_enter,
+ 	.fb_debug_leave = drm_fb_helper_debug_leave,
+#endif
+ };
+ 
+ static int vboxfb_create_object(struct vbox_fbdev *fbdev,
+-- 
+2.53.0
+