From 5f838c804aab88bb0382a57b0fe531e6be53bc13 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Thu, 4 May 2023 13:07:10 -0700 Subject: [PATCH] LU-16795 build: Update ZFS version to 2.1.11 Update ZFS version to 2.1.11. The changes are listed in: https://github.com/openzfs/zfs/releases/tag/zfs-2.1.11 Lustre-change: https://review.whamcloud.com/50856 Lustre-commit: f827e1e04e36f3f8533c321c1248c7b0a62da287 Change-Id: I51de752fd82174586bcda7a9a42152b9fb2111bd Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50863 Reviewed-by: Oleg Drokin Reviewed-by: Colin Faber Tested-by: jenkins Tested-by: Maloo --- contrib/lbuild/lbuild | 2 +- lustre/ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index d236071..c5af861 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -1028,7 +1028,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.5} + SPLZFSVER=${SPLZFSVER:-2.1.11} 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 a74e389..5b24239 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -63,7 +63,7 @@ TBD Whamcloud 5.11.0-31 (Ubuntu 20.04.3 HWE) 5.11.0 (vanilla kernel.org) * Recommended e2fsprogs version: 1.46.6-wc1 or newer - * Recommended ZFS version: 2.1.5 + * Recommended ZFS version: 2.1.11 * 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. -- 1.8.3.1