drop 6.1 cifs patch

will add it back in a bit...

diff --git a/queue-6.1/cifs-fix-flushing-folio-regression-for-6.1-backport.patch b/queue-6.1/cifs-fix-flushing-folio-regression-for-6.1-backport.patch
deleted file mode 100644 (file)
index 094442a..0000000
--- a/queue-6.1/cifs-fix-flushing-folio-regression-for-6.1-backport.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ba288a873fb8ac3d1bf5563366558a905620c071 Mon Sep 17 00:00:00 2001
-From: Steve French <stfrench@microsoft.com>
-Date: Fri, 12 Jan 2024 23:08:51 -0600
-Subject: cifs: fix flushing folio regression for 6.1 backport
-
-filemap_get_folio works differenty in 6.1 vs. later kernels
-(returning NULL in 6.1 instead of an error).  Add
-this minor correction which addresses the regression in the patch:
-  cifs: Fix flushing, invalidation and file size with copy_file_range()
-
-Suggested-by: David Howells <dhowells@redhat.com>
-Reported-by: Salvatore Bonaccorso <carnil@debian.org>
-Signed-off-by: Steve French <stfrench@microsoft.com>
-Tested-by: Salvatore Bonaccorso <carnil@debian.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/smb/client/cifsfs.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/fs/smb/client/cifsfs.c
-+++ b/fs/smb/client/cifsfs.c
-@@ -1240,7 +1240,7 @@ static int cifs_flush_folio(struct inode
-       int rc = 0;
- 
-       folio = filemap_get_folio(inode->i_mapping, index);
--      if (IS_ERR(folio))
-+      if ((!folio) || (IS_ERR(folio)))
-               return 0;
- 
-       size = folio_size(folio);

diff --git a/queue-6.1/series b/queue-6.1/series
index d8b7cec38877eea58a1a9a90c0127e84df561f8d..d489b1832e505668ae305eaf25a315780749383f 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -1,4 +1,3 @@
-cifs-fix-flushing-folio-regression-for-6.1-backport.patch
 revert-nfsd-call-nfsd_last_thread-before-final-nfsd_put.patch
 revert-nfsd-separate-nfsd_last_thread-from-nfsd_put.patch
 ipv6-remove-max_size-check-inline-with-ipv4.patch