diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index 37826fc309..07494c5b63 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -1050,7 +1050,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.4.2} + SPLZFSVER=${SPLZFSVER:-0.6.5.2} SPLZFSTAG=${SPLZFSTAG:-} # The files expect a kver to be set to the kernel version . diff --git a/lustre/ChangeLog b/lustre/ChangeLog index c2862cba0f..fd0b72db7d 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -16,6 +16,8 @@ TBD Intel Corporation 3.0.101-0.47.55 (SLES11 SP3) 3.12.39-47 (SLES12) * Recommended e2fsprogs version: 1.42.13.wc3 or newer + * Recommended ZFS / SPL version: 0.6.5.2 + * Tested with ZFS / SPL version: 0.6.5.2 * 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.