sysutils/openzfs*: Bump to fix HEAD build failures

Approved by:	maintainer
Reviewed by:	kbowling
Sponsored by:	iXsystems, Inc.
Differential Revision:	https://reviews.freebsd.org/D30851

5 files changed, 65 insertions, 42 deletions

diff --git a/sysutils/openzfs-kmod/Makefile b/sysutils/openzfs-kmod/Makefile
index 72cdf6d07d86..a3ea8041aa81 100644
--- a/sysutils/openzfs-kmod/Makefile
+++ b/sysutils/openzfs-kmod/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openzfs
-PORTVERSION=	2021030100
+PORTVERSION=	2021062100
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-kmod
@@ -15,7 +15,7 @@ USES=		kmod
 USE_GITHUB=	yes
 GH_ACCOUNT=	openzfs
 GH_PROJECT=	zfs
-GH_TAGNAME=	2e160dee9
+GH_TAGNAME=	ba9131156
 KMODTARGET?=	openzfs.ko
 
 PLIST_FILES=	${KMODDIR}/${KMODTARGET}
diff --git a/sysutils/openzfs-kmod/distinfo b/sysutils/openzfs-kmod/distinfo
index 504edcefa2af..e2dcc433bf7c 100644
--- a/sysutils/openzfs-kmod/distinfo
+++ b/sysutils/openzfs-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614632193
-SHA256 (openzfs-zfs-v2021030100-2e160dee9_GH0.tar.gz) = af6a6467479d01f58cbbb38f0ab54afcb5708d298dd6a43b8678ad6a423ca428
-SIZE (openzfs-zfs-v2021030100-2e160dee9_GH0.tar.gz) = 31344155
+TIMESTAMP = 1624292748
+SHA256 (openzfs-zfs-v2021062100-ba9131156_GH0.tar.gz) = dade85e4adcec42e21cfdf6b9ef7e0bdb94f2ef2e862f9caca4772d8f07aa487
+SIZE (openzfs-zfs-v2021062100-ba9131156_GH0.tar.gz) = 31369359
diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile
index 242bac9cbbec..03aa79cb05e8 100644
--- a/sysutils/openzfs/Makefile
+++ b/sysutils/openzfs/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openzfs
-PORTVERSION=	2021030100
+PORTVERSION=	2021062100
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -26,7 +26,7 @@ OPTIONS_SUB=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	openzfs
 GH_PROJECT=	zfs
-GH_TAGNAME=	2e160dee9
+GH_TAGNAME=	ba9131156
 
 .include <bsd.port.pre.mk>
 
@@ -40,6 +40,7 @@ CONFIGURE_ARGS+=	--enable-debug --enable-debuginfo
 
 .if ${PORT_OPTIONS:MPYTHON}
 CONFIGURE_ARGS+=	--with-python=${PYTHON_VER}
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sysctl>0:devel/py-sysctl@${PY_FLAVOR}
diff --git a/sysutils/openzfs/distinfo b/sysutils/openzfs/distinfo
index 39dcc0757498..318a70804e4d 100644
--- a/sysutils/openzfs/distinfo
+++ b/sysutils/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614632503
-SHA256 (openzfs-zfs-v2021030100-2e160dee9_GH0.tar.gz) = af6a6467479d01f58cbbb38f0ab54afcb5708d298dd6a43b8678ad6a423ca428
-SIZE (openzfs-zfs-v2021030100-2e160dee9_GH0.tar.gz) = 31344155
+TIMESTAMP = 1624292916
+SHA256 (openzfs-zfs-v2021062100-ba9131156_GH0.tar.gz) = dade85e4adcec42e21cfdf6b9ef7e0bdb94f2ef2e862f9caca4772d8f07aa487
+SIZE (openzfs-zfs-v2021062100-ba9131156_GH0.tar.gz) = 31369359
diff --git a/sysutils/openzfs/pkg-plist b/sysutils/openzfs/pkg-plist
index 2dca495ed0a1..2179e6448ca8 100644
--- a/sysutils/openzfs/pkg-plist
+++ b/sysutils/openzfs/pkg-plist
@@ -119,6 +119,7 @@ include/libspl/sys/varargs.h
 include/libspl/sys/vfs.h
 include/libspl/sys/vnode.h
 include/libspl/sys/vtoc.h
+include/libspl/sys/wmsum.h
 include/libspl/sys/zfs_context_os.h
 include/libspl/sys/zone.h
 include/libspl/thread.h
@@ -134,7 +135,6 @@ include/libzfs/libuutil_common.h
 include/libzfs/libuutil_impl.h
 include/libzfs/libzfs.h
 include/libzfs/libzfs_core.h
-include/libzfs/libzfs_impl.h
 include/libzfs/libzfsbootenv.h
 include/libzfs/libzutil.h
 include/libzfs/sys/abd.h
@@ -299,7 +299,7 @@ lib/libuutil.so.3.0.0
 lib/libzfs.a
 lib/libzfs.so
 lib/libzfs.so.4
-lib/libzfs.so.4.0.0
+lib/libzfs.so.4.1.0
 lib/libzfs_core.a
 lib/libzfs_core.so
 lib/libzfs_core.so.3
@@ -310,40 +310,40 @@ lib/libzfsbootenv.so.1
 lib/libzfsbootenv.so.1.0.0
 lib/libzpool.a
 lib/libzpool.so
-lib/libzpool.so.4
-lib/libzpool.so.4.0.0
+lib/libzpool.so.5
+lib/libzpool.so.5.0.0
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_error_translation.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_libzfs_core.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_nvlist.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/ctypes.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/exceptions.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_constants%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_error_translation%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_libzfs_core%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_nvlist%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/ctypes%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/exceptions%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/_constants.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/_error_translation.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/_libzfs_core.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/_nvlist.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/libnvpair.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/libzfs_core.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/libnvpair%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/libzfs_core%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/libnvpair.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/libzfs_core.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/ctypes.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/exceptions.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/test_libzfs_core.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/test_nvlist.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/test_libzfs_core%%PYTHON_EXT_SUFFIX%%.pyc
+%%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.0.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.0.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.0.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.0.0-py%%PYTHON_VER%%.egg-info/not-zip-safe
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.0.0-py%%PYTHON_VER%%.egg-info/requires.txt
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.0.0-py%%PYTHON_VER%%.egg-info/top_level.txt
+%%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
 lib/security/pam_zfs_key.so
 libdata/pkgconfig/libzfs.pc
 libdata/pkgconfig/libzfs_core.pc
@@ -397,11 +397,14 @@ man/man1/arcstat.1.gz
 man/man1/zhack.1.gz
 man/man1/ztest.1.gz
 man/man1/zvol_wait.1.gz
-man/man5/spl-module-parameters.5.gz
+man/man4/spl.4.gz
+man/man4/zfs.4.gz
 man/man5/vdev_id.conf.5.gz
-man/man5/zfs-events.5.gz
-man/man5/zfs-module-parameters.5.gz
-man/man5/zpool-features.5.gz
+man/man7/zfsconcepts.7.gz
+man/man7/zfsprops.7.gz
+man/man7/zpool-features.7.gz
+man/man7/zpoolconcepts.7.gz
+man/man7/zpoolprops.7.gz
 man/man8/fsck.zfs.8.gz
 man/man8/mount.zfs.8.gz
 man/man8/vdev_id.8.gz
@@ -446,8 +449,6 @@ man/man8/zfs-userspace.8.gz
 man/man8/zfs-wait.8.gz
 man/man8/zfs.8.gz
 man/man8/zfs_ids_to_path.8.gz
-man/man8/zfsconcepts.8.gz
-man/man8/zfsprops.8.gz
 man/man8/zinject.8.gz
 man/man8/zpool-add.8.gz
 man/man8/zpool-attach.8.gz
@@ -482,8 +483,6 @@ man/man8/zpool-upgrade.8.gz
 man/man8/zpool-wait.8.gz
 man/man8/zpool.8.gz
 man/man8/zpool_influxdb.8.gz
-man/man8/zpoolconcepts.8.gz
-man/man8/zpoolprops.8.gz
 man/man8/zstream.8.gz
 man/man8/zstreamdump.8.gz
 sbin/fsck.zfs
@@ -522,6 +521,8 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/compatibility.d/grub2
 %%TESTS%%share/zfs/compatibility.d/openzfs-2.0-freebsd
 %%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/openzfsonosx-1.7.0
 %%TESTS%%share/zfs/compatibility.d/openzfsonosx-1.8.1
 %%TESTS%%share/zfs/compatibility.d/openzfsonosx-1.9.3
@@ -529,6 +530,8 @@ 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/zol-0.6.1
+%%TESTS%%share/zfs/compatibility.d/zol-0.6.4
 %%TESTS%%share/zfs/compatibility.d/zol-0.6.5
 %%TESTS%%share/zfs/compatibility.d/zol-0.7
 %%TESTS%%share/zfs/compatibility.d/zol-0.8
@@ -584,6 +587,11 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/include/zpool_script.shlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/acl/acl.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/acl/acl_common.kshlib
+%%TESTS%%share/zfs/zfs-tests/tests/functional/acl/off/cleanup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/acl/off/dosmode.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/acl/off/dosmode_readonly_write
+%%TESTS%%share/zfs/zfs-tests/tests/functional/acl/off/posixmode.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/acl/off/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/acl/posix-sa/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/acl/posix-sa/posix_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/acl/posix-sa/posix_002_pos.ksh
@@ -889,6 +897,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_destroy/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_condense_and_disable.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_condense_races.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_dedup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_002_pos.ksh
@@ -945,6 +954,9 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_jail/jail.conf
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_jail/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_jail/zfs_jail_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_load-key/HEXKEY
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_load-key/RAWKEY
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_load-key/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_load-key/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key.cfg
@@ -952,6 +964,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_all.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_common.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_file.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_https.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_location.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_noop.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_recursive.ksh
@@ -1074,6 +1087,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_encrypted.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_encrypted_unloaded.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_raw.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_skip_missing.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_sparse.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_set/cache_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_set/cache_002_neg.ksh
@@ -1323,6 +1337,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/import_cachefile_device_replaced.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/import_cachefile_mirror_attached.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/import_cachefile_mirror_detached.ksh
+%%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_paths_changed.ksh
@@ -1363,6 +1378,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_attach_detach_add_remove.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_fault_export_import_online.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_import_export.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_offline_export_import_online.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_online_offline.ksh
@@ -1458,6 +1474,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_trim/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_attach_detach_add_remove.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_fault_export_import_online.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_import_export.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_multiple.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_neg.ksh
@@ -1663,6 +1680,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/ctime/ctime_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/ctime/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/deadman/deadman.cfg
+%%TESTS%%share/zfs/zfs-tests/tests/functional/deadman/deadman_ratelimit.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/deadman/deadman_sync.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/deadman/deadman_zio.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/delegate/cleanup.ksh
@@ -1702,6 +1720,8 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/events_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/events_common.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/events/zed_fd_spill-zedlet
+%%TESTS%%share/zfs/zfs-tests/tests/functional/events/zed_fd_spill.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/zed_rc_filter.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/exec/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/exec/exec_001_pos.ksh
@@ -2050,6 +2070,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/redacted_mounts.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/redacted_negative.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/redacted_origin.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/redacted_panic.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/redacted_props.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/redacted_resume.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/redacted_size.ksh
@@ -2058,9 +2079,11 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy.kshlib
+%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid1.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid2.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid3.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid_spare1.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid_spare2.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid_spare3.ksh
@@ -2363,7 +2386,6 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/userquota/userspace_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/userquota/userspace_003_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/userquota/userspace_encrypted.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/userquota/userspace_send_encrypted.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/vdev_zaps/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/vdev_zaps/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/vdev_zaps/vdev_zaps.kshlib