ZFS 2.1.10 upstream release

2 files changed, 13 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 54f3dab5366a..93a8a299df5b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,28 @@
 pkgbase = zfs-dkms
 	pkgdesc = Kernel modules for the Zettabyte File System.
-	pkgver = 2.1.9
-	pkgrel = 2
+	pkgver = 2.1.10
+	pkgrel = 1
 	url = https://zfsonlinux.org/
 	arch = any
 	license = CDDL
-	provides = ZFS-MODULE=2.1.9
-	provides = SPL-MODULE=2.1.9
+	provides = ZFS-MODULE=2.1.10
+	provides = SPL-MODULE=2.1.10
 	provides = spl-dkms
 	provides = zfs
 	conflicts = spl-dkms
 	replaces = spl-dkms
-	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.9/zfs-2.1.9.tar.gz
-	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.9/zfs-2.1.9.tar.gz.asc
-	source = https://github.com/openzfs/zfs/commit/59f187563937aa0d6c74a9854eb1cab6632866f9.patch
+	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.10/zfs-2.1.10.tar.gz
+	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.10/zfs-2.1.10.tar.gz.asc
 	source = 0001-only-build-the-module-in-dkms.conf.patch
 	validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027
 	validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B
-	sha256sums = 6b172cdf2eb54e17fcd68f900fab33c1430c5c59848fa46fab83614922fe50f6
+	sha256sums = f3abb83a1a4c0cd4f064f3c6a7cc133f800a76dd40b3fec1d15a31ad08471ab9
 	sha256sums = SKIP
-	sha256sums = 659a214380e77b5eb4f629c02eeaaf7cb4b0f9ffe316d17bb19ae370b54bc912
 	sha256sums = 8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5
-	b2sums = d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812
+	b2sums = 5b1a17d192097f5eab1ef3192217fa34b276b6f344a5114a5411be43208616ac682ae2129ae9da15b4ba6207171ae82140f823041a8067441459d51d994df271
 	b2sums = SKIP
-	b2sums = 95424713f291a5974686b9dbf02ef5bfb3ef59b01a6a05b00c7c033c015a23ec6ad256e2b140b68e839058dad76496996caaf2018d11a1846dc906cd988258f5
 	b2sums = 58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791
 
 pkgname = zfs-dkms
-	depends = zfs-utils=2.1.9
+	depends = zfs-utils=2.1.10
 	depends = dkms
diff --git a/PKGBUILD b/PKGBUILD
index 35bfd8f0c027..99b3c3d8e000 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
 
 pkgname=zfs-dkms
-pkgver=2.1.9
-pkgrel=2
+pkgver=2.1.10
+pkgrel=1
 pkgdesc="Kernel modules for the Zettabyte File System."
 arch=('any')
 url="https://zfsonlinux.org/"
@@ -15,15 +15,12 @@ provides=("ZFS-MODULE=${pkgver}" "SPL-MODULE=${pkgver}" 'spl-dkms')
 provides+=('zfs')
 replaces=('spl-dkms')
 source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc}
-        "https://github.com/openzfs/zfs/commit/59f187563937aa0d6c74a9854eb1cab6632866f9.patch"
         "0001-only-build-the-module-in-dkms.conf.patch")
-sha256sums=('6b172cdf2eb54e17fcd68f900fab33c1430c5c59848fa46fab83614922fe50f6'
+sha256sums=('f3abb83a1a4c0cd4f064f3c6a7cc133f800a76dd40b3fec1d15a31ad08471ab9'
             'SKIP'
-            '659a214380e77b5eb4f629c02eeaaf7cb4b0f9ffe316d17bb19ae370b54bc912'
             '8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5')
-b2sums=('d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812'
+b2sums=('5b1a17d192097f5eab1ef3192217fa34b276b6f344a5114a5411be43208616ac682ae2129ae9da15b4ba6207171ae82140f823041a8067441459d51d994df271'
         'SKIP'
-        '95424713f291a5974686b9dbf02ef5bfb3ef59b01a6a05b00c7c033c015a23ec6ad256e2b140b68e839058dad76496996caaf2018d11a1846dc906cd988258f5'
         '58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791')
 validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027'  # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov>
               'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov>
@@ -33,9 +30,6 @@ prepare() {
 
     patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch
 
-    # Backport fix for build issues on linux-6.2.8 kernel. (https://github.com/openzfs/zfs/issues/14658)
-    patch -p1 -i ../59f187563937aa0d6c74a9854eb1cab6632866f9.patch
-
     # remove unneeded sections from module build
     sed -ri "/AC_CONFIG_FILES/,/]\)/{
 /AC_CONFIG_FILES/n