From: Jian Yu <yujian@whamcloud.com>
Date: Mon, 15 Nov 2021 17:01:18 +0000 (-0800)
Subject: LU-15222 build: Update ZFS version to 2.0.6
X-Git-Tag: 2.14.56~34
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=8e6ef2d91b3acbec5ad1157404c263277a25cbb3

LU-15222 build: Update ZFS version to 2.0.6

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

Change-Id: I2a7df45b79f402c3d3bce8b137edd11b5224b576
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/45567
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Olaf Faaland-LLNL <faaland1@llnl.gov>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index 8feddbe..8577999 100755
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -1019,7 +1019,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.0.0}
+    SPLZFSVER=${SPLZFSVER:-2.0.6}
     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 2eb2d81..127dce5 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -52,7 +52,7 @@ TBD Whamcloud
          5.11.0-31            (Ubuntu 20.04.3 HWE)
          5.11.0               (vanilla kernel.org)
        * Recommended e2fsprogs version: 1.46.2.wc1 or newer
-       * Recommended ZFS version: 2.0.0
+       * Recommended ZFS version: 2.0.6
        * 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.