From 676db0201988cd8e8a3cc4791b541e5162fab2f2 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Fri, 22 Nov 2024 16:32:44 +0800
Subject: [PATCH] modules: kmod-fs-cifs fix build with kernel 6.12

---
 package/kernel/linux/modules/fs.mk         | 16 ++++++++--------
 package/kernel/linux/modules/netsupport.mk |  4 ++--
 package/kernel/linux/modules/nls.mk        |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index 5ea917cc1..8f7cfe74b 100644
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -10,7 +10,7 @@ FS_MENU:=Filesystems
 define KernelPackage/fs-9p
   SUBMENU:=$(FS_MENU)
   TITLE:=Plan 9 Resource Sharing Support
-  DEPENDS:=+kmod-9pnet +LINUX_6_1:kmod-fs-netfs +LINUX_6_6:kmod-fs-netfs
+  DEPENDS:=+kmod-9pnet +LINUX_6_1:kmod-fs-netfs +LINUX_6_6||LINUX_6_12:kmod-fs-netfs
   KCONFIG:=\
 	CONFIG_9P_FS \
 	CONFIG_9P_FS_POSIX_ACL=n \
@@ -93,7 +93,7 @@ define KernelPackage/fs-smbfs-common
   DEPENDS:= \
 	+(LINUX_5_4||LINUX_5_10):kmod-crypto-arc4 \
 	+(LINUX_5_4||LINUX_5_10):kmod-crypto-md4 \
-	+LINUX_6_6:kmod-fs-netfs +LINUX_6_6:kmod-nls-ucs2-utils
+	+LINUX_6_6||LINUX_6_12:kmod-fs-netfs +LINUX_6_6||LINUX_6_12:kmod-nls-ucs2-utils
   FILES:= \
 	$(LINUX_DIR)/fs/smbfs_common/cifs_arc4.ko@lt6.1 \
 	$(LINUX_DIR)/fs/smbfs_common/cifs_md4.ko@lt6.1 \
@@ -131,9 +131,9 @@ define KernelPackage/fs-cifs
     +kmod-crypto-ccm \
     +kmod-crypto-ecb \
     +kmod-crypto-des \
-    +(LINUX_5_15||LINUX_6_1||LINUX_6_6):kmod-asn1-decoder \
-    +(LINUX_5_15||LINUX_6_1||LINUX_6_6):kmod-oid-registry \
-    +(LINUX_5_15||LINUX_6_1||LINUX_6_6):kmod-dnsresolver
+    +(LINUX_5_15||LINUX_6_1||LINUX_6_6||LINUX_6_12):kmod-asn1-decoder \
+    +(LINUX_5_15||LINUX_6_1||LINUX_6_6||LINUX_6_12):kmod-oid-registry \
+    +(LINUX_5_15||LINUX_6_1||LINUX_6_6||LINUX_6_12):kmod-dnsresolver
 endef
 
 define KernelPackage/fs-cifs/description
@@ -349,7 +349,7 @@ define KernelPackage/fs-jfs
   KCONFIG:=CONFIG_JFS_FS
   FILES:=$(LINUX_DIR)/fs/jfs/jfs.ko
   AUTOLOAD:=$(call AutoLoad,30,jfs,1)
-  DEPENDS:=+LINUX_6_6:kmod-nls-ucs2-utils
+  DEPENDS:=+LINUX_6_6||LINUX_6_12:kmod-nls-ucs2-utils
   $(call AddDepends/nls)
 endef
 
@@ -394,7 +394,7 @@ $(eval $(call KernelPackage,fs-msdos))
 define KernelPackage/fs-netfs
   SUBMENU:=$(FS_MENU)
   TITLE:=Network Filesystems support
-  DEPENDS:=@(LINUX_5_15||LINUX_6_1||LINUX_6_6)
+  DEPENDS:=@(LINUX_5_15||LINUX_6_1||LINUX_6_6||LINUX_6_12)
   KCONFIG:= CONFIG_NETFS_SUPPORT
   FILES:=$(LINUX_DIR)/fs/netfs/netfs.ko
   AUTOLOAD:=$(call AutoLoad,28,netfs)
@@ -681,7 +681,7 @@ define KernelPackage/pstore
 	CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
   FILES:= $(LINUX_DIR)/fs/pstore/pstore.ko
   AUTOLOAD:=$(call AutoLoad,30,pstore,1)
-  DEPENDS:=+LINUX_6_6:kmod-lib-zlib-deflate +LINUX_6_6:kmod-lib-zlib-inflate
+  DEPENDS:=+LINUX_6_6||LINUX_6_12:kmod-lib-zlib-deflate +LINUX_6_6||LINUX_6_12:kmod-lib-zlib-inflate
 endef
 
 define KernelPackage/pstore/description
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 5b68cf08c..3fa6a0547 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -911,7 +911,7 @@ $(eval $(call KernelPackage,sched-ipset))
 define KernelPackage/sched-mqprio-common
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=mqprio queue common dependencies support
-  DEPENDS:=@LINUX_6_6
+  DEPENDS:=@LINUX_6_6||LINUX_6_12
   HIDDEN:=1
   KCONFIG:=CONFIG_NET_SCH_MQPRIO_LIB
   FILES:=$(LINUX_DIR)/net/sched/sch_mqprio_lib.ko
@@ -927,7 +927,7 @@ $(eval $(call KernelPackage,sched-mqprio-common))
 define KernelPackage/sched-mqprio
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Multi-queue priority scheduler (MQPRIO)
-  DEPENDS:=+kmod-sched-core +LINUX_6_6:kmod-sched-mqprio-common
+  DEPENDS:=+kmod-sched-core +LINUX_6_6||LINUX_6_12:kmod-sched-mqprio-common
   KCONFIG:=CONFIG_NET_SCH_MQPRIO
   FILES:=$(LINUX_DIR)/net/sched/sch_mqprio.ko
   AUTOLOAD:=$(call AutoProbe, sch_mqprio)
diff --git a/package/kernel/linux/modules/nls.mk b/package/kernel/linux/modules/nls.mk
index 3ef0d43e1..525575117 100644
--- a/package/kernel/linux/modules/nls.mk
+++ b/package/kernel/linux/modules/nls.mk
@@ -343,7 +343,7 @@ $(eval $(call KernelPackage,nls-utf8))
 define KernelPackage/nls-ucs2-utils
   SUBMENU:=Native Language Support
   TITLE:=UCS-2 common library
-  DEPENDS+=@LINUX_6_6
+  DEPENDS+=@LINUX_6_6||LINUX_6_12
   HIDDEN:=1
   KCONFIG:=CONFIG_NLS_UCS2_UTILS
   FILES:=$(LINUX_DIR)/fs/nls/nls_ucs2_utils.ko