From: Jian Yu <yujian@whamcloud.com>
Date: Tue, 26 Jul 2022 07:15:49 +0000 (-0700)
Subject: LU-16048 build: Update ZFS version to 2.1.5
X-Git-Tag: 2.15.52~52
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F40%2F48040%2F3;p=fs%2Flustre-release.git

LU-16048 build: Update ZFS version to 2.1.5

Update ZFS version to 2.1.5. The changes are listed in:
https://github.com/openzfs/zfs/releases/tag/zfs-2.1.5

Change-Id: I9f25aafe889f87fb80677e59dbe4679932d8b920
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/48040
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index 86d0f62..3f3ae98 100755
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -1023,7 +1023,7 @@ build_spl_zfs() {
     # The spl/zfs spec files expect RPM_BUILD_ROOT to point to the root of the
     # destination for the rpms
     export RPM_BUILD_ROOT=$TOPDIR
-    SPLZFSVER=${SPLZFSVER:-2.1.2}
+    SPLZFSVER=${SPLZFSVER:-2.1.5}
     SPLZFSTAG=${SPLZFSTAG:-}
     # "spl zfs" prior to 0.8.0
     # "zfs" for 0.8.0 and later
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 8aa38b1..aeaefcd 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -57,7 +57,7 @@ TBD Whamcloud
          5.11.0-31            (Ubuntu 20.04.3 HWE)
          5.11.0               (vanilla kernel.org)
        * Recommended e2fsprogs version: 1.46.2.wc5 or newer
-       * Recommended ZFS version: 2.1.2
+       * Recommended ZFS version: 2.1.5
        * NFS export disabled when stack size < 8192 (32-bit Lustre clients),
          since the NFSv4 export of Lustre filesystem with 4K stack may cause a
          stack overflow. For more information, please refer to bugzilla 17630.