sysutils/openzfs, sysutils/openzfs-kmod: update to ZFS 2.2.2

Among other things, this fixes an important data corruption bug.  It
also fixes the build on FreeBSD 14.

https://github.com/openzfs/zfs/releases/tag/zfs-2.2.2

PR:		275239
MFH:		2023Q4
Approved by:	mikael (ports)
Sponsored-by:	Axcient

(cherry picked from commit 117f55784d981833d6b51038afc215239382e651)

5 files changed, 86 insertions, 23 deletions

diff --git a/sysutils/openzfs-kmod/Makefile b/sysutils/openzfs-kmod/Makefile
index f7693248db3d..efe70503f18a 100644
--- a/sysutils/openzfs-kmod/Makefile
+++ b/sysutils/openzfs-kmod/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	openzfs
-PORTVERSION=	2023012600
+PORTVERSION=	2023113000
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-kmod
 
@@ -16,7 +15,7 @@ BROKEN_i386=	build fails
 USES=		cpe kmod
 USE_GITHUB=	yes
 GH_PROJECT=	zfs
-GH_TAGNAME=	dc5c8006f
+GH_TAGNAME=	494aaae
 KMODTARGET?=	openzfs.ko
 
 PLIST_FILES=	${KMODDIR}/${KMODTARGET}
diff --git a/sysutils/openzfs-kmod/distinfo b/sysutils/openzfs-kmod/distinfo
index 03b78d8d1270..46df98bb02c8 100644
--- a/sysutils/openzfs-kmod/distinfo
+++ b/sysutils/openzfs-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674753310
-SHA256 (openzfs-zfs-v2023012600-dc5c8006f_GH0.tar.gz) = a04eac19a4a90377b0874281e2a9fc1d944b1d5714c667df999d65eeb5a6071d
-SIZE (openzfs-zfs-v2023012600-dc5c8006f_GH0.tar.gz) = 32880990
+TIMESTAMP = 1701967598
+SHA256 (openzfs-zfs-v2023113000-494aaae_GH0.tar.gz) = 7f77e73bacb7bb081e3344fb20e5ebffd6a6c0b10cad1b6c572d44866a94eea6
+SIZE (openzfs-zfs-v2023113000-494aaae_GH0.tar.gz) = 33039586
diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile
index 081141d54564..b3638595519e 100644
--- a/sysutils/openzfs/Makefile
+++ b/sysutils/openzfs/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	openzfs
-PORTVERSION=	2023012600
+PORTVERSION=	2023113000
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	freqlabs@FreeBSD.org
@@ -16,7 +15,7 @@ BROKEN_riscv64=	fails to compile: btree_test.c:462:49: result of comparison of c
 BUILD_DEPENDS=	ksh93:shells/ksh93
 RUN_DEPENDS=	openzfs-kmod>=0:sysutils/openzfs-kmod
 
-USES+=		autoreconf:build cpe libtool gmake gettext-runtime python:build shebangfix
+USES+=		autoreconf:build cpe libtool gmake gettext-runtime python:build shebangfix ssl
 SHEBANG_GLOB=	*.ksh *.ksh.in *.kshlib *.py.in
 SHEBANG_FILES=	tests/zfs-tests/tests/functional/trim/trim.cfg \
 		cmd/arcstat.in \
@@ -34,7 +33,7 @@ OPTIONS_SUB=	yes
 
 USE_GITHUB=	yes
 GH_PROJECT=	zfs
-GH_TAGNAME=	dc5c8006f
+GH_TAGNAME=	494aaae
 
 USE_LDCONFIG=	yes
 
diff --git a/sysutils/openzfs/distinfo b/sysutils/openzfs/distinfo
index 4c0f3bb3cbbb..6b9911e58395 100644
--- a/sysutils/openzfs/distinfo
+++ b/sysutils/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674753898
-SHA256 (openzfs-zfs-v2023012600-dc5c8006f_GH0.tar.gz) = a04eac19a4a90377b0874281e2a9fc1d944b1d5714c667df999d65eeb5a6071d
-SIZE (openzfs-zfs-v2023012600-dc5c8006f_GH0.tar.gz) = 32880990
+TIMESTAMP = 1701967689
+SHA256 (openzfs-zfs-v2023113000-494aaae_GH0.tar.gz) = 7f77e73bacb7bb081e3344fb20e5ebffd6a6c0b10cad1b6c572d44866a94eea6
+SIZE (openzfs-zfs-v2023113000-494aaae_GH0.tar.gz) = 33039586
diff --git a/sysutils/openzfs/pkg-plist b/sysutils/openzfs/pkg-plist
index 770516311d7d..0b21d0d69ca8 100644
--- a/sysutils/openzfs/pkg-plist
+++ b/sysutils/openzfs/pkg-plist
@@ -92,7 +92,6 @@ include/libspl/sys/policy.h
 include/libspl/sys/poll.h
 include/libspl/sys/priv.h
 include/libspl/sys/processor.h
-include/libspl/sys/sha2.h
 include/libspl/sys/simd.h
 include/libspl/sys/stack.h
 include/libspl/sys/stat.h
@@ -132,6 +131,7 @@ include/libzfs/sys/arc_impl.h
 include/libzfs/sys/asm_linkage.h
 include/libzfs/sys/avl.h
 include/libzfs/sys/avl_impl.h
+include/libzfs/sys/bitmap.h
 include/libzfs/sys/bitops.h
 include/libzfs/sys/blake3.h
 include/libzfs/sys/blkptr.h
@@ -139,6 +139,8 @@ include/libzfs/sys/bplist.h
 include/libzfs/sys/bpobj.h
 include/libzfs/sys/bptree.h
 include/libzfs/sys/bqueue.h
+include/libzfs/sys/brt.h
+include/libzfs/sys/brt_impl.h
 include/libzfs/sys/btree.h
 include/libzfs/sys/crypto/api.h
 include/libzfs/sys/crypto/common.h
@@ -195,6 +197,7 @@ include/libzfs/sys/range_tree.h
 include/libzfs/sys/rrwlock.h
 include/libzfs/sys/sa.h
 include/libzfs/sys/sa_impl.h
+include/libzfs/sys/sha2.h
 include/libzfs/sys/skein.h
 include/libzfs/sys/spa.h
 include/libzfs/sys/spa_checkpoint.h
@@ -246,6 +249,7 @@ include/libzfs/sys/zfs_debug.h
 include/libzfs/sys/zfs_delay.h
 include/libzfs/sys/zfs_file.h
 include/libzfs/sys/zfs_fuid.h
+include/libzfs/sys/zfs_impl.h
 include/libzfs/sys/zfs_project.h
 include/libzfs/sys/zfs_quota.h
 include/libzfs/sys/zfs_racct.h
@@ -326,16 +330,17 @@ lib/libzpool.so.5.0.0
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/test_nvlist%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/test_libzfs_core.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/test_nvlist.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.1.99-py%%PYTHON_VER%%.egg-info/PKG-INFO
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.1.99-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.1.99-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.1.99-py%%PYTHON_VER%%.egg-info/not-zip-safe
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.1.99-py%%PYTHON_VER%%.egg-info/requires.txt
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.1.99-py%%PYTHON_VER%%.egg-info/top_level.txt
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.2-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.2-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.2-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.2-py%%PYTHON_VER%%.egg-info/not-zip-safe
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.2-py%%PYTHON_VER%%.egg-info/requires.txt
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.2-py%%PYTHON_VER%%.egg-info/top_level.txt
 lib/security/pam_zfs_key.so
 libdata/pkgconfig/libzfs.pc
 libdata/pkgconfig/libzfs_core.pc
 libdata/pkgconfig/libzfsbootenv.pc
+libexec/zfs/zfs_prepare_disk
 libexec/zfs/zpool.d/ata_err
 libexec/zfs/zpool.d/cmd_to
 libexec/zfs/zpool.d/defect
@@ -389,6 +394,7 @@ man/man4/spl.4.gz
 man/man4/zfs.4.gz
 man/man5/vdev_id.conf.5.gz
 man/man7/dracut.zfs.7.gz
+man/man7/vdevprops.7.gz
 man/man7/zfsconcepts.7.gz
 man/man7/zfsprops.7.gz
 man/man7/zpool-features.7.gz
@@ -433,13 +439,13 @@ man/man8/zfs-unallow.8.gz
 man/man8/zfs-unjail.8.gz
 man/man8/zfs-unload-key.8.gz
 man/man8/zfs-unmount.8.gz
-man/man8/zfs-unzone.8.gz
 man/man8/zfs-upgrade.8.gz
 man/man8/zfs-userspace.8.gz
 man/man8/zfs-wait.8.gz
-man/man8/zfs-zone.8.gz
 man/man8/zfs.8.gz
 man/man8/zfs_ids_to_path.8.gz
+man/man8/zfs_prepare_disk.8.gz
+man/man8/zgenhostid.8.gz
 man/man8/zinject.8.gz
 man/man8/zpool-add.8.gz
 man/man8/zpool-attach.8.gz
@@ -504,6 +510,11 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/compatibility.d/freebsd-12.0
 %%TESTS%%share/zfs/compatibility.d/freebsd-12.1
 %%TESTS%%share/zfs/compatibility.d/freebsd-12.2
+%%TESTS%%share/zfs/compatibility.d/freebsd-12.3
+%%TESTS%%share/zfs/compatibility.d/freebsd-12.4
+%%TESTS%%share/zfs/compatibility.d/freebsd-13.0
+%%TESTS%%share/zfs/compatibility.d/freebsd-13.1
+%%TESTS%%share/zfs/compatibility.d/freebsd-13.2
 %%TESTS%%share/zfs/compatibility.d/freenas-11.0
 %%TESTS%%share/zfs/compatibility.d/freenas-11.1
 %%TESTS%%share/zfs/compatibility.d/freenas-11.2
@@ -514,6 +525,9 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/compatibility.d/openzfs-2.0-linux
 %%TESTS%%share/zfs/compatibility.d/openzfs-2.1-freebsd
 %%TESTS%%share/zfs/compatibility.d/openzfs-2.1-linux
+%%TESTS%%share/zfs/compatibility.d/openzfs-2.2
+%%TESTS%%share/zfs/compatibility.d/openzfs-2.2-freebsd
+%%TESTS%%share/zfs/compatibility.d/openzfs-2.2-linux
 %%TESTS%%share/zfs/compatibility.d/openzfsonosx-1.7.0
 %%TESTS%%share/zfs/compatibility.d/openzfsonosx-1.8.1
 %%TESTS%%share/zfs/compatibility.d/openzfsonosx-1.9.3
@@ -521,6 +535,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/compatibility.d/truenas-12.0
 %%TESTS%%share/zfs/compatibility.d/ubuntu-18.04
 %%TESTS%%share/zfs/compatibility.d/ubuntu-20.04
+%%TESTS%%share/zfs/compatibility.d/ubuntu-22.04
 %%TESTS%%share/zfs/compatibility.d/zol-0.6.1
 %%TESTS%%share/zfs/compatibility.d/zol-0.6.4
 %%TESTS%%share/zfs/compatibility.d/zol-0.6.5
@@ -622,6 +637,8 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/alloc_class/alloc_class_011_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/alloc_class/alloc_class_012_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/alloc_class/alloc_class_013_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/alloc_class/alloc_class_014_neg.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/alloc_class/alloc_class_015_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/alloc_class/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/alloc_class/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/append/cleanup.ksh
@@ -644,6 +661,20 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/atime/root_atime_on.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/atime/root_relatime_on.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/atime/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning.kshlib
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_cross_dataset.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_partial.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_disabled_copyfilerange.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_disabled_ficlone.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_disabled_ficlonerange.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_ficlone.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_ficlonerange.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_ficlonerange_partial.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/cleanup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/bootfs/bootfs_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/bootfs/bootfs_002_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/bootfs/bootfs_003_pos.ksh
@@ -824,11 +855,13 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_006_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_args_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_args_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_backup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_block_size_histogram.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_checksum.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_decompress.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_decompress_zstd.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_display_block.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_encrypted.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_label_checksum.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_object_range_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_object_range_pos.ksh
@@ -1046,6 +1079,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_corrective.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_from_encrypted.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_from_zstd.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_large_block_corrective.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_new_props.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_raw.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_raw_-d.ksh
@@ -1133,6 +1167,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_feature_activation.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_keylocation.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_nomount.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_share/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_share/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share.cfg
@@ -1216,7 +1251,11 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_wait/zfs_wait.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_wait/zfs_wait_deleteq.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_wait/zfs_wait_getsubopt.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zhack/zhack_label_checksum.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zhack/library.kshlib
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zhack/zhack_label_repair_001.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zhack/zhack_label_repair_002.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zhack/zhack_label_repair_003.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zhack/zhack_label_repair_004.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool/zpool_001_neg.ksh
@@ -1334,6 +1373,8 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_004_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_get/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_get/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_get/vdev_get.cfg
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_get/vdev_get_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_002_pos.ksh
@@ -1357,6 +1398,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/import_cachefile_paths_changed.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/import_cachefile_shared_device.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/import_devices_missing.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/import_log_missing.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/import_paths_changed.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/import_rewind_config_changed.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/import_rewind_device_replaced.ksh
@@ -1388,6 +1430,10 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_features_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_features_002_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_features_003_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile_unclean_export.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_unclean_export.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_003_pos.ksh
@@ -1403,6 +1449,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_start_and_cancel_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_start_and_cancel_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_suspend_resume.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_uninit.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_unsupported_vdevs.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_verify_checksums.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_verify_initialized.ksh
@@ -1446,9 +1493,14 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_resilver/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_resilver/zpool_resilver.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_resilver/zpool_resilver_bad_args.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_resilver/zpool_resilver_concurrent.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_resilver/zpool_resilver_restart.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_scrub/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_scrub/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_error_scrub_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_error_scrub_002_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_error_scrub_003_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_error_scrub_004_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_001_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_002_pos.ksh
@@ -1461,10 +1513,14 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_print_repairing.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/user_property_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/user_property_002_neg.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/vdev_set_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_002_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_003_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_ashift.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_common.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_features.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_split/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_split/setup.ksh
@@ -1485,6 +1541,8 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_003_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_004_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_005_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_006_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_007_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_features_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_sync/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_sync/setup.ksh
@@ -1770,6 +1828,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/fault/auto_online_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/fault/auto_online_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/fault/auto_replace_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/fault/auto_replace_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/fault/auto_spare_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/fault/auto_spare_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/fault/auto_spare_ashift.ksh
@@ -1951,6 +2010,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/mmap/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/mmap/mmap.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/mmap/mmap_libaio_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/mmap/mmap_mixed.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/mmap/mmap_read_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/mmap/mmap_seek_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/mmap/mmap_sync_001_pos.ksh
@@ -1994,6 +2054,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/no_space/enospc_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/no_space/enospc_003_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/no_space/enospc_df.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/no_space/enospc_ganging.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/no_space/enospc_rm.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/no_space/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/nopwrite/cleanup.ksh
@@ -2015,7 +2076,9 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/online_offline/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/pam/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/pam/pam_basic.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/pam/pam_change_unmounted.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/pam/pam_nounmount.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/pam/pam_recursive.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/pam/pam_short_password.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/pam/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/pam/utilities.kshlib
@@ -2177,6 +2240,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/removal/removal_with_export.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/removal/removal_with_faulted.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/removal/removal_with_ganging.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/removal/removal_with_indirect.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/removal/removal_with_remove.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/removal/removal_with_scrub.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/removal/removal_with_send.ksh
@@ -2281,6 +2345,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_028_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_029_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_030_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_031_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send-L_toggle.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send-c_embedded_blocks.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send-c_incremental.ksh