Update compatibility patch for 5.17

4 files changed, 18 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50c9df9f3e65..28e68c6a3421 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ntfs3-dkms-git
 	pkgdesc = NTFS3 is fully functional NTFS Read-Write driver. The driver works with NTFS versions up to 3.1.
 	pkgver = 5.15.r9.g52e00ea
-	pkgrel = 4
+	pkgrel = 5
 	epoch = 1
 	url = https://github.com/Paragon-Software-Group/linux-ntfs3
 	arch = any
@@ -20,10 +20,10 @@ pkgbase = ntfs3-dkms-git
 	source = kernel-5.15-backport.patch
 	source = kernel-5.16.patch
 	sha256sums = fd4cf0e2dc160efecc55d4ea99667669b870599e4e81be435ec2201381b7e2ac
-	sha256sums = 55db2894a265ec5ba50ea3edc05259f9260b5819a8fe65dbb4e0ab5aa58b3ee7
+	sha256sums = 1c7c30b21878f15d5eacc2fda563d94fd7491f1681818b7ca7a377c588abf2f4
 	sha256sums = b1674d6bb9b255a059efc4eae0846a426620a7a236dff19f4d0f85dfe2bbfd0d
 	sha256sums = f176a508596d0021beae0af264f2ef92d46062c7b12e89e4f4e8104d91118d85
 	sha256sums = 69c315bbb37e831adacedaa5eff1b32571ef86a24dcdb2a312a015bf824f6569
-	sha256sums = 62bdd84924a189b24912cf7a938c61fff6bd5aa314359e62bdd6efffc49b907b
+	sha256sums = e61b3876ad3b474229ee6707cb7664783cdd6888676dfc433b49a45682083d5a
 
 pkgname = ntfs3-dkms-git
diff --git a/PKGBUILD b/PKGBUILD
index c2fa1c7e7a0f..c0f5eb1373e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=ntfs3-dkms-git
 pkgver=5.15.r9.g52e00ea
-pkgrel=4
+pkgrel=5
 epoch=1
 pkgdesc="NTFS3 is fully functional NTFS Read-Write driver. The driver works with NTFS versions up to 3.1."
 arch=('any')
@@ -23,11 +23,11 @@ source=(
 
 sha256sums=(
     'fd4cf0e2dc160efecc55d4ea99667669b870599e4e81be435ec2201381b7e2ac'
-    '55db2894a265ec5ba50ea3edc05259f9260b5819a8fe65dbb4e0ab5aa58b3ee7'
+    '1c7c30b21878f15d5eacc2fda563d94fd7491f1681818b7ca7a377c588abf2f4'
     'b1674d6bb9b255a059efc4eae0846a426620a7a236dff19f4d0f85dfe2bbfd0d'
     'f176a508596d0021beae0af264f2ef92d46062c7b12e89e4f4e8104d91118d85'
     '69c315bbb37e831adacedaa5eff1b32571ef86a24dcdb2a312a015bf824f6569'
-    '62bdd84924a189b24912cf7a938c61fff6bd5aa314359e62bdd6efffc49b907b'
+    'e61b3876ad3b474229ee6707cb7664783cdd6888676dfc433b49a45682083d5a'
 )
 
 _ver="5.15"
diff --git a/dkms.conf b/dkms.conf
index 9125780cd617..69362ffce40e 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -6,7 +6,7 @@ AUTOINSTALL="yes"
 MAKE[0]="KVERSION=$kernelver CONFIG_NTFS3_FS=m CONFIG_NTFS3_LZX_XPRESS=y CONFIG_NTFS3_FS_POSIX_ACL=y make KDIR=$kernel_source_dir"
 BUILD_EXCLUSIVE_KERNEL="^5\..*"
 PATCH[0]="kernel-5.16.patch"
-PATCH_MATCH[0]="^(5\.16\.).*"
+PATCH_MATCH[0]="^(5\.1[6-9]\.).*"
 PATCH[1]="kernel-5.15-backport.patch"
 PATCH_MATCH[1]="^(5\.[0-9]\.|5\.1[0-4]\.).*"
 PATCH[2]="kernel-5.14-backport.patch"
diff --git a/kernel-5.16.patch b/kernel-5.16.patch
index 8b257e045c6c..89ddcd039432 100644
--- a/kernel-5.16.patch
+++ b/kernel-5.16.patch
@@ -9,3 +9,14 @@
  			err = -EFAULT;
  			goto out;
  		}
+
+--- a/ntfs_fs.h
++++ b/ntfs_fs.h
+@@ -11,7 +11,6 @@
+ 
+ #include <linux/blkdev.h>
+ #include <linux/buffer_head.h>
+-#include <linux/cleancache.h>
+ #include <linux/fs.h>
+ #include <linux/highmem.h>
+ #include <linux/kernel.h>