drop version numbers for cifs modules from 6.1

Makes no sense for stable kernels (or mainline)

diff --git a/queue-6.6/cifs-update-internal-module-version-number-for-cifs..patch b/queue-6.6/cifs-update-internal-module-version-number-for-cifs..patch
deleted file mode 100644 (file)
index cddc478..0000000
--- a/queue-6.6/cifs-update-internal-module-version-number-for-cifs..patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From a67adc0e5df58c64f9db7b49b5b9b9bf4b198bb3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 20 Jul 2023 08:30:32 -0500
-Subject: cifs: update internal module version number for cifs.ko
-
-From: Steve French <stfrench@microsoft.com>
-
-[ Upstream commit fd2bd7c0539e28f267a84da8d68f9378511b50a7 ]
-
-From 2.45 to 2.46
-
-Signed-off-by: Steve French <stfrench@microsoft.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/smb/client/cifsfs.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fs/smb/client/cifsfs.h b/fs/smb/client/cifsfs.h
-index 41daebd220ff4..32ccc4d43df65 100644
---- a/fs/smb/client/cifsfs.h
-+++ b/fs/smb/client/cifsfs.h
-@@ -152,6 +152,6 @@ extern const struct export_operations cifs_export_ops;
- #endif /* CONFIG_CIFS_NFSD_EXPORT */
- 
- /* when changing internal version - update following two lines at same time */
--#define SMB3_PRODUCT_BUILD 45
--#define CIFS_VERSION   "2.45"
-+#define SMB3_PRODUCT_BUILD 46
-+#define CIFS_VERSION   "2.46"
- #endif                                /* _CIFSFS_H */
--- 
-2.43.0
-

diff --git a/queue-6.6/cifs-update-internal-module-version-number-for-cifs..patch-8866 b/queue-6.6/cifs-update-internal-module-version-number-for-cifs..patch-8866
deleted file mode 100644 (file)
index c3e4124..0000000
--- a/queue-6.6/cifs-update-internal-module-version-number-for-cifs..patch-8866
+++ /dev/null
@@ -1,33 +0,0 @@
-From e1f498eebf35c71cc0c1247996020849ebc5a629 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 9 Jan 2024 23:42:51 -0600
-Subject: cifs: update internal module version number for cifs.ko
-
-From: Steve French <stfrench@microsoft.com>
-
-[ Upstream commit fd2bd7c0539e28f267a84da8d68f9378511b50a7 ]
-
-From 2.45 to 2.46
-
-Signed-off-by: Steve French <stfrench@microsoft.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/smb/client/cifsfs.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fs/smb/client/cifsfs.h b/fs/smb/client/cifsfs.h
-index 32ccc4d43df65..4b3aaa04e7cb7 100644
---- a/fs/smb/client/cifsfs.h
-+++ b/fs/smb/client/cifsfs.h
-@@ -152,6 +152,6 @@ extern const struct export_operations cifs_export_ops;
- #endif /* CONFIG_CIFS_NFSD_EXPORT */
- 
- /* when changing internal version - update following two lines at same time */
--#define SMB3_PRODUCT_BUILD 46
--#define CIFS_VERSION   "2.46"
-+#define SMB3_PRODUCT_BUILD 47
-+#define CIFS_VERSION   "2.47"
- #endif                                /* _CIFSFS_H */
--- 
-2.43.0
-

diff --git a/queue-6.6/cifs-update-internal-module-version-number-for-cifs..patch-9055 b/queue-6.6/cifs-update-internal-module-version-number-for-cifs..patch-9055
deleted file mode 100644 (file)
index c828ce1..0000000
--- a/queue-6.6/cifs-update-internal-module-version-number-for-cifs..patch-9055
+++ /dev/null
@@ -1,33 +0,0 @@
-From 58a23b024f531589c313697b53a879120f3c3436 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 25 Feb 2024 19:33:50 -0600
-Subject: cifs: update internal module version number for cifs.ko
-
-From: Steve French <stfrench@microsoft.com>
-
-[ Upstream commit fd2bd7c0539e28f267a84da8d68f9378511b50a7 ]
-
-From 2.45 to 2.46
-
-Signed-off-by: Steve French <stfrench@microsoft.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/smb/client/cifsfs.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fs/smb/client/cifsfs.h b/fs/smb/client/cifsfs.h
-index 4b3aaa04e7cb7..10a9d39cda9a4 100644
---- a/fs/smb/client/cifsfs.h
-+++ b/fs/smb/client/cifsfs.h
-@@ -152,6 +152,6 @@ extern const struct export_operations cifs_export_ops;
- #endif /* CONFIG_CIFS_NFSD_EXPORT */
- 
- /* when changing internal version - update following two lines at same time */
--#define SMB3_PRODUCT_BUILD 47
--#define CIFS_VERSION   "2.47"
-+#define SMB3_PRODUCT_BUILD 48
-+#define CIFS_VERSION   "2.48"
- #endif                                /* _CIFSFS_H */
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 486a2ba5cd261893b90faaf3a7b60b34e9e8732e..b6c67278f8abfbd75b83fd33131ff4bbd0ab1b13 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -7,7 +7,6 @@ smb3-minor-rdma-cleanup.patch
 smb3-more-minor-cleanups-for-session-handling-routin.patch
 smb3-minor-cleanup-of-session-handling-code.patch
 missing-field-not-being-returned-in-ioctl-cifs_ioc_g.patch
-cifs-update-internal-module-version-number-for-cifs..patch
 cifs-fix-use-after-free-for-iface-while-disabling-se.patch
 smb-client-introduce-cifs_sfu_make_node.patch
 smb-client-fix-minor-whitespace-errors-and-warnings.patch
@@ -24,7 +23,6 @@ cifs-get-rid-of-dup-length-check-in-parse_reparse_po.patch
 cifs-remove-unneeded-return-statement.patch
 ksmbd-auth-fix-most-kernel-doc-warnings.patch
 ksmbd-vfs-fix-all-kernel-doc-warnings.patch
-cifs-update-internal-module-version-number-for-cifs..patch-8866
 cifs-remove-redundant-variable-tcon_exist.patch
 cifs-minor-comment-cleanup.patch
 cifs-pick-channel-for-tcon-and-tdis.patch
@@ -58,7 +56,6 @@ smb3-add-dynamic-trace-point-for-ioctls.patch
 smb-client-negotiate-compression-algorithms.patch
 smb-common-fix-fields-sizes-in-compression_pattern_p.patch
 smb-common-simplify-compression-headers.patch
-cifs-update-internal-module-version-number-for-cifs..patch-9055
 ksmbd-mark-smb2_session_expired-to-session-when-dest.patch
 ksmbd-add-support-for-durable-handles-v1-v2.patch
 cifs-defer-close-file-handles-having-rh-lease.patch