Update to 5.17

6 files changed, 46 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5610c890cdd5..280ab8e6a8a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ntfs3-dkms
 	pkgdesc = NTFS3 is fully functional NTFS Read-Write driver. The driver works with NTFS versions up to 3.1.
-	pkgver = 5.16
+	pkgver = 5.17
 	pkgrel = 1
 	epoch = 1
 	url = https://www.kernel.org/doc/html/latest/filesystems/ntfs3.html
@@ -10,22 +10,22 @@ pkgbase = ntfs3-dkms
 	provides = NTFS3-MODULE
 	provides = ntfs3
 	conflicts = ntfs3
-	noextract = linux-5.16.tar.gz
+	noextract = linux-5.17.tar.gz
 	options = !strip
 	options = !emptydirs
-	source = linux-5.16.tar.gz::https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-5.16.tar.gz
+	source = linux-5.17.tar.gz::https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-5.17.tar.gz
 	source = Makefile.patch
 	source = dkms.conf
 	source = kernel-5.12-backport.patch
 	source = kernel-5.14-backport.patch
 	source = kernel-5.15-backport.patch
 	source = kernel-5.16-backport.patch
-	sha512sums = e7e2e3208e681eef8557138763e7460418264d8fbad3dbb965cf7d40e9d55800419199de78774458775ca593f550f6b50e7e3bc8fad75edd085d08d1c5933b40
-	sha512sums = 533c249f0f6bd4833faf02d0d92ca1b5802a49afc5feb2e46a7d37275cfca7896db76cd83593f4f313977d278a9a7e92eda550667be2b93910c49cfb68ead4fb
-	sha512sums = a46d538f3d166741dafcbc880f6322932478170aa0edf17b57a4e9f1543bea4c75970f08b39d67a14d48b63ac7a1c18f3a30fe763660b39ed404933eb0e37308
-	sha512sums = 4b1976b40f67c210ee4052407a359ed8db0709a568387ffacc15e695b43af7c77b53fbe27a3365197521e5c9baa8bd9c7aaffa2f8345be17129216b1ac141fbe
-	sha512sums = 61a1948e3e607dabaca47742777b4ea92fadf9f5416ebaef8c06f1e17aab0f3ced34e900c0cf1ed462303f391f4a4713b5b30a488b349839780bde3248e19f3c
-	sha512sums = 3a9395f5729c14cd8d8bf2ecda566730d90c6990319ed5e33310fa2dbe4d4a33df925950ff652fff338ef0135e5aeecf4b991603bba797847f8f1ef9130420c7
-	sha512sums = d13e320a127bb3c8988d040d6c27b98981ca4352fb29ca57e5afa9b549f271c33a668beaefd142ca21f8930371aec5aedaaf1d07c157abb05c30f4899b643cdf
+	sha256sums = f58338c5b06314559a269afe70b33b9b0b75cc2fe5e8a537ac29f70caa6e489b
+	sha256sums = fd4cf0e2dc160efecc55d4ea99667669b870599e4e81be435ec2201381b7e2ac
+	sha256sums = 9cb620446fc07ade4018637313a749e192d44a03e1f8b10529746730bacf6feb
+	sha256sums = 44ce1edf931aec236d3dcb5a08441f4c03ccd60fdcd5ba949989c11938eeb371
+	sha256sums = 869165f7b738a5fee41f1015d531459650d2c862fa2aaed252e692474d77c84c
+	sha256sums = 26613999994cec08dfa4b53e9a5c1f97174ac2fc2b7f99c52b7ff7b88fdd1a45
+	sha256sums = 8d397fd1c7d64835f712d47bf425732ae8abe8305aea570f1b53cfca9c8a97cf
 
 pkgname = ntfs3-dkms
diff --git a/PKGBUILD b/PKGBUILD
index 2029515550c7..3a0197b002a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=ntfs3-dkms
-pkgver=5.16
+pkgver=5.17
 pkgrel=1
 epoch=1
 pkgdesc="NTFS3 is fully functional NTFS Read-Write driver. The driver works with NTFS versions up to 3.1."
@@ -24,34 +24,23 @@ source=(
     "kernel-5.16-backport.patch"
 )
 
-sha512sums=(
-    'e7e2e3208e681eef8557138763e7460418264d8fbad3dbb965cf7d40e9d55800419199de78774458775ca593f550f6b50e7e3bc8fad75edd085d08d1c5933b40'
-    '533c249f0f6bd4833faf02d0d92ca1b5802a49afc5feb2e46a7d37275cfca7896db76cd83593f4f313977d278a9a7e92eda550667be2b93910c49cfb68ead4fb'
-    'a46d538f3d166741dafcbc880f6322932478170aa0edf17b57a4e9f1543bea4c75970f08b39d67a14d48b63ac7a1c18f3a30fe763660b39ed404933eb0e37308'
-    '4b1976b40f67c210ee4052407a359ed8db0709a568387ffacc15e695b43af7c77b53fbe27a3365197521e5c9baa8bd9c7aaffa2f8345be17129216b1ac141fbe'
-    '61a1948e3e607dabaca47742777b4ea92fadf9f5416ebaef8c06f1e17aab0f3ced34e900c0cf1ed462303f391f4a4713b5b30a488b349839780bde3248e19f3c'
-    '3a9395f5729c14cd8d8bf2ecda566730d90c6990319ed5e33310fa2dbe4d4a33df925950ff652fff338ef0135e5aeecf4b991603bba797847f8f1ef9130420c7'
-    'd13e320a127bb3c8988d040d6c27b98981ca4352fb29ca57e5afa9b549f271c33a668beaefd142ca21f8930371aec5aedaaf1d07c157abb05c30f4899b643cdf'
+sha256sums=(
+    'f58338c5b06314559a269afe70b33b9b0b75cc2fe5e8a537ac29f70caa6e489b'
+    'fd4cf0e2dc160efecc55d4ea99667669b870599e4e81be435ec2201381b7e2ac'
+    '9cb620446fc07ade4018637313a749e192d44a03e1f8b10529746730bacf6feb'
+    '44ce1edf931aec236d3dcb5a08441f4c03ccd60fdcd5ba949989c11938eeb371'
+    '869165f7b738a5fee41f1015d531459650d2c862fa2aaed252e692474d77c84c'
+    '26613999994cec08dfa4b53e9a5c1f97174ac2fc2b7f99c52b7ff7b88fdd1a45'
+    '8d397fd1c7d64835f712d47bf425732ae8abe8305aea570f1b53cfca9c8a97cf'
 )
 
 noextract=("${_archive}")
 
 prepare() {
     cd "${srcdir}"
-    tar xf "${_archive}" "${_snapshot}/fs/ntfs3" --strip-components=2
-}
-
-package() {
-    cd "${srcdir}"
-
-    local dest=$(install -dm755 "${pkgdir}/usr/src/ntfs3-${pkgver}" && echo "$_")
-
-    install -Dm644 -t "${dest}" "dkms.conf"
-
-    install -dm755 "${dest}/patches" && cp -t "$_" "kernel-"*.patch
+    tar --strip-components=2 -xf "${_archive}" "${_snapshot}/fs/ntfs3"
 
     cd "ntfs3"
-
     patch -p0 -N -i "${srcdir}/Makefile.patch"
 
     # For testing
@@ -59,6 +48,16 @@ package() {
     # patch -p1 -N -i "${srcdir}/kernel-5.15-backport.patch"
     # patch -p1 -N -i "${srcdir}/kernel-5.14-backport.patch"
     # patch -p1 -N -i "${srcdir}/kernel-5.12-backport.patch"
+}
 
+package() {
+    local dest="${pkgdir}/usr/src/ntfs3-${pkgver}"
+    install -dm755 "${dest}"
+
+    cd "${srcdir}"
+    install -Dm644 -t "${dest}" "dkms.conf"
+    install -dm755 "${dest}/patches" && cp -t "$_" "kernel-"*.patch
+
+    cd "ntfs3"
     cp -rt "${dest}" *
 }
diff --git a/dkms.conf b/dkms.conf
index b8492a43f6a5..b80d013df9a2 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,14 +1,15 @@
 PACKAGE_NAME="ntfs3"
-PACKAGE_VERSION="5.16"
+PACKAGE_VERSION="5.17"
 BUILT_MODULE_NAME[0]="ntfs3"
 DEST_MODULE_LOCATION[0]="/kernel/fs/ntfs3"
 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-backport.patch"
-PATCH_MATCH[0]="^([0-4]\.|5\.[0-9]\.|5\.1[0-5]\.).*"
+PATCH_MATCH[0]="^(5\.[0-9]\.|5\.1[0-5]\.).*"
 PATCH[1]="kernel-5.15-backport.patch"
-PATCH_MATCH[1]="^([0-4]\.|5\.[0-9]\.|5\.1[0-4]\.).*"
+PATCH_MATCH[1]="^(5\.[0-9]\.|5\.1[0-4]\.).*"
 PATCH[2]="kernel-5.14-backport.patch"
-PATCH_MATCH[2]="^([0-4]\.|5\.[0-9]\.|5\.1[0-3]\.).*"
+PATCH_MATCH[2]="^(5\.[0-9]\.|5\.1[0-3]\.).*"
 PATCH[3]="kernel-5.12-backport.patch"
-PATCH_MATCH[3]="^([0-4]\.|5\.[0-9]\.|5\.1[0-1]\.).*"
+PATCH_MATCH[3]="^(5\.[0-9]\.|5\.1[0-1]\.).*"
diff --git a/kernel-5.12-backport.patch b/kernel-5.12-backport.patch
index f7c4d171b710..e1ffb350fd2c 100644
--- a/kernel-5.12-backport.patch
+++ b/kernel-5.12-backport.patch
@@ -1,6 +1,6 @@
 --- a/file.c
 +++ b/file.c
-@@ -69,7 +69,7 @@
+@@ -70,7 +70,7 @@
  /*
   * ntfs_getattr - inode_operations::getattr
   */
@@ -9,7 +9,7 @@
  		 struct kstat *stat, u32 request_mask, u32 flags)
  {
  	struct inode *inode = d_inode(path->dentry);
-@@ -83,7 +83,7 @@
+@@ -84,7 +84,7 @@
  
  	stat->attributes_mask |= STATX_ATTR_COMPRESSED | STATX_ATTR_ENCRYPTED;
  
@@ -18,7 +18,7 @@
  
  	stat->result_mask |= STATX_BTIME;
  	stat->btime = ni->i_crtime;
-@@ -728,7 +728,7 @@
+@@ -729,7 +729,7 @@
  /*
   * ntfs3_setattr - inode_operations::setattr
   */
@@ -27,7 +27,7 @@
  		  struct iattr *attr)
  {
  	struct super_block *sb = dentry->d_sb;
-@@ -747,7 +747,7 @@
+@@ -748,7 +748,7 @@
  		ia_valid = attr->ia_valid;
  	}
  
@@ -36,7 +36,7 @@
  	if (err)
  		goto out;
  
-@@ -772,10 +772,10 @@
+@@ -773,10 +773,10 @@
  		ni->ni_flags |= NI_FLAG_UPDATE_PARENT;
  	}
  
@@ -167,7 +167,7 @@
 
 --- a/ntfs_fs.h
 +++ b/ntfs_fs.h
-@@ -486,11 +486,11 @@
+@@ -485,11 +485,11 @@
  extern const struct file_operations ntfs_dir_operations;
  
  /* Globals from file.c */
@@ -181,7 +181,7 @@
  		  struct iattr *attr);
  int ntfs_file_open(struct inode *inode, struct file *file);
  int ntfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
-@@ -695,7 +695,7 @@
+@@ -694,7 +694,7 @@
  int ntfs_flush_inodes(struct super_block *sb, struct inode *i1,
  		      struct inode *i2);
  int inode_write_data(struct inode *inode, const void *data, size_t bytes);
@@ -190,7 +190,7 @@
  				struct inode *dir, struct dentry *dentry,
  				const struct cpu_str *uni, umode_t mode,
  				dev_t dev, const char *symname, u32 size,
-@@ -837,17 +837,17 @@
+@@ -836,17 +836,17 @@
  /* globals from xattr.c */
  #ifdef CONFIG_NTFS3_FS_POSIX_ACL
  struct posix_acl *ntfs_get_acl(struct inode *inode, int type);
diff --git a/kernel-5.14-backport.patch b/kernel-5.14-backport.patch
index 8cf9fa5669f2..81b033e00244 100644
--- a/kernel-5.14-backport.patch
+++ b/kernel-5.14-backport.patch
@@ -1,6 +1,6 @@
 --- a/file.c
 +++ b/file.c
-@@ -1028,10 +1028,10 @@
+@@ -1029,10 +1029,10 @@
  			size_t cp, tail = PAGE_SIZE - off;
  
  			page = pages[ip];
diff --git a/kernel-5.15-backport.patch b/kernel-5.15-backport.patch
index 3e4e013af2fa..32ecaf3ab3fc 100644
--- a/kernel-5.15-backport.patch
+++ b/kernel-5.15-backport.patch
@@ -1,6 +1,6 @@
 --- a/ntfs_fs.h
 +++ b/ntfs_fs.h
-@@ -836,7 +836,7 @@
+@@ -835,7 +835,7 @@
  
  /* globals from xattr.c */
  #ifdef CONFIG_NTFS3_FS_POSIX_ACL