From: Nathaniel Clark <nathaniel.l.clark@intel.com>
Date: Mon, 16 May 2016 11:01:21 +0000 (-0400)
Subject: LU-8146 osd-zfs: Build against SPL/ZFS 0.6.5.7
X-Git-Tag: 2.8.55~60
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=3b91944fb5a1f8e47188899cfeae5a2af8cf1d07

LU-8146 osd-zfs: Build against SPL/ZFS 0.6.5.7

Build against SPL/ZFS 0.6.5.7.

ZFS Changelogs since 0.6.5.6:
https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5.7

Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Change-Id: Icdde350e4f7fee6e72f2eab2548ef07b44f0dacb
Reviewed-on: http://review.whamcloud.com/20219
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
---

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index 97cb7a0..725cdf1 100755
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -890,7 +890,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:-0.6.5.6}
+    SPLZFSVER=${SPLZFSVER:-0.6.5.7}
     SPLZFSTAG=${SPLZFSTAG:-}
 
     # The files expect a kver to be set to the kernel version .
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index a56ce20..4e2cc99 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -24,8 +24,8 @@ TBD Intel Corporation
          3.12.57-60.35       (SLES12 SP1)
          vanilla linux 4.2.1
        * Recommended e2fsprogs version: 1.42.13.wc4 or newer
-       * Recommended ZFS / SPL version: 0.6.5.6
-       * Tested with ZFS / SPL version: 0.6.5.6
+       * Recommended ZFS / SPL version: 0.6.5.7
+       * Tested with ZFS / SPL version: 0.6.5.7
        * 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.