[packages/lin_tape] - move 6.1 specific fix to the correct patch
baggins
baggins at pld-linux.org
Sun Dec 14 23:34:26 CET 2025
commit 4a667fa61bac5e15eacbb4c4cc56f820c4c8a198
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Dec 15 01:34:06 2025 +0100
- move 6.1 specific fix to the correct patch
kernel-6.1.patch | 11 +++++++++++
no-distro-defs.patch | 19 -------------------
2 files changed, 11 insertions(+), 19 deletions(-)
---
diff --git a/kernel-6.1.patch b/kernel-6.1.patch
index e6df92c..38a38fa 100644
--- a/kernel-6.1.patch
+++ b/kernel-6.1.patch
@@ -30,3 +30,14 @@
return scsi_execute_cmd(sdev, cmd, data_direction==DMA_FROM_DEVICE?REQ_OP_DRV_IN:REQ_OP_DRV_OUT,
buffer, bufflen, timeout, retries, NULL);
#else
+--- lin_tape-3.0.71/lin_tape_scsi_tape.c~ 2025-12-15 01:33:03.000000000 +0100
++++ lin_tape-3.0.71/lin_tape_scsi_tape.c 2025-12-15 01:33:28.366651245 +0100
+@@ -11568,7 +11568,7 @@
+ #else
+ down_read(¤t->mm->mmap_sem);
+ #endif
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,0,0) || defined(RHEL96)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) || defined(RHEL96)
+ mapped_pages = get_user_pages((ulong)user_location, number_pages,
+ rw, pages);
+ #elif LINUX_VERSION_CODE == KERNEL_VERSION(4,4,73) \
diff --git a/no-distro-defs.patch b/no-distro-defs.patch
index 49192ed..71a0a05 100644
--- a/no-distro-defs.patch
+++ b/no-distro-defs.patch
@@ -90,22 +90,3 @@
if (blk_verify_command(pfo_cmd->scsi_cmd, mode & FMODE_WRITE))
#else
/* RHEL 6.4 and beyond */
---- lin_tape-3.0.71/lin_tape_scsi_tape.c~ 2025-12-15 01:06:34.000000000 +0100
-+++ lin_tape-3.0.71/lin_tape_scsi_tape.c 2025-12-15 01:13:10.333317926 +0100
-@@ -11568,15 +11568,7 @@
- #else
- down_read(¤t->mm->mmap_sem);
- #endif
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,0,0) || defined(RHEL96)
-- mapped_pages = get_user_pages((ulong)user_location, number_pages,
-- rw, pages);
--#elif LINUX_VERSION_CODE == KERNEL_VERSION(4,4,73) \
-- || (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,92) && LINUX_VERSION_CODE < KERNEL_VERSION(4,4,103)) \
-- || defined(SLESKERNEL_4_4_103_6) \
-- || (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,114) && !defined(SLESSP2)) \
-- || (LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) && defined(SLESSP2)) \
-- || defined (SLESKERNEL_4_4_103_94)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,0,0)
- mapped_pages = get_user_pages((unsigned long)user_location, number_pages,
- rw, pages, NULL);
- #elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lin_tape.git/commitdiff/4a667fa61bac5e15eacbb4c4cc56f820c4c8a198
More information about the pld-cvs-commit
mailing list