Accepting request 1207351 from filesystems

- Update to release 20240917
  * Linux 6.11 support

OBS-URL: https://build.opensuse.org/request/show/1207351
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vhba-kmp?expand=0&rev=24

_scmsync.obsinfo

@@ -0,0 +1,4 @@
+mtime: 1728684809
+commit: 0f37ba3ea5350737d4d7866cf41495e8f51a4c1283a31b5637871540a91f4061
+url: https://src.opensuse.org/jengelh/vhba-kmp
+revision: master

build.specials.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:be151ad87830d6546350f6729bfd54225ae860c98f2ae33b3c4f6677d1400c23
+size 256

vhba-kmp.changes

@@ -1,16 +1,3 @@
--------------------------------------------------------------------
-Tue Aug  5 11:43:56 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update vhba-sle-kernel.diff to workaround the presence of
-  block-simplify-tag-allocation-policy-selection.patch API change
-  in SLE16 kernel [boo#1247593]
-
--------------------------------------------------------------------
-Tue Apr 15 10:23:57 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 20250329
-  * Linux 6.14 support
-
 -------------------------------------------------------------------
 Fri Oct 11 22:12:51 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

vhba-kmp.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package vhba-kmp
 #
-# Copyright (c) 2025 SUSE LLC and contributors
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           vhba-kmp
-Version:        20250329
+Version:        20240917
 Release:        0
 Summary:        Virtual SCSI Host Bus Adapter
 License:        GPL-2.0-or-later
@@ -57,7 +57,7 @@ echo %flavors_to_build
 %autosetup -n vhba-module-%version -p1
 
 %build
-%if 0%{?sle_version} || 0%{?suse_version} < 1650
+%if 0%{?sle_version} >= 150500 && 0%{?sle_version} < 160000
 export KCFLAGS="-DSLE"
 %endif
 for flavor in %flavors_to_build; do

vhba-sle-kernel.diff

@@ -4,14 +4,14 @@ Date: 2023-04-20 10:58:03.045935811 +0200
 Workaround failing VHBA compilation for the SLE 15.5 kernel API.
 
 ---
- vhba.c |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ vhba.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
-Index: vhba-module-20250329/vhba.c
+Index: vhba-module-20211218/vhba.c
 ===================================================================
---- vhba-module-20250329.orig/vhba.c
-+++ vhba-module-20250329/vhba.c
-@@ -203,7 +203,7 @@ static int vhba_device_queue (struct vhb
+--- vhba-module-20211218.orig/vhba.c
++++ vhba-module-20211218/vhba.c
+@@ -203,7 +203,7 @@ int vhba_device_queue (struct vhba_devic
      vcmd->cmd = cmd;
  
      spin_lock_irqsave(&vdev->cmd_lock, flags);
@@ -20,7 +20,7 @@ Index: vhba-module-20250329/vhba.c
      vcmd->metatag = scsi_cmd_to_rq(vcmd->cmd)->tag;
  #else
      vcmd->metatag = vcmd->cmd->request->tag;
-@@ -477,7 +477,7 @@ static int vhba_queuecommand (struct Scs
+@@ -477,7 +477,7 @@ int vhba_queuecommand (struct Scsi_Host
      int retval;
      unsigned int devnum;
  
@@ -29,7 +29,7 @@ Index: vhba-module-20250329/vhba.c
      scmd_dbg(cmd, "queue %p tag %i\n", cmd, scsi_cmd_to_rq(cmd)->tag);
  #else
      scmd_dbg(cmd, "queue %p tag %i\n", cmd, cmd->request->tag);
-@@ -489,7 +489,7 @@ static int vhba_queuecommand (struct Scs
+@@ -489,7 +489,7 @@ int vhba_queuecommand (struct Scsi_Host
          scmd_dbg(cmd, "no such device\n");
  
          cmd->result = DID_NO_CONNECT << 16;
@@ -38,16 +38,7 @@ Index: vhba-module-20250329/vhba.c
          scsi_done(cmd);
  #else
          cmd->scsi_done(cmd);
-@@ -537,7 +537,7 @@ static struct scsi_host_template vhba_te
- #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
-     .slave_alloc = vhba_slave_alloc,
- #endif
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0) || (defined(SLE) && LINUX_VERSION_CODE == KERNEL_VERSION(6, 12, 0))
-     .tag_alloc_policy_rr = true,
- #elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
-     .tag_alloc_policy = BLK_TAG_ALLOC_RR,
-@@ -830,7 +830,7 @@ static ssize_t vhba_ctl_write (struct fi
+@@ -828,7 +828,7 @@ ssize_t vhba_ctl_write (struct file *fil
  
      spin_lock_irqsave(&vdev->cmd_lock, flags);
      if (ret >= 0) {
@@ -56,7 +47,7 @@ Index: vhba-module-20250329/vhba.c
          scsi_done(vcmd->cmd);
  #else
          vcmd->cmd->scsi_done(vcmd->cmd);
-@@ -960,7 +960,7 @@ static int vhba_ctl_release (struct inod
+@@ -958,7 +958,7 @@ int vhba_ctl_release (struct inode *inod
  
          scmd_dbg(vcmd->cmd, "device released with command %lu (%p)\n", vcmd->metatag, vcmd->cmd);
          vcmd->cmd->result = DID_NO_CONNECT << 16;