filesystems/openzfs: Update to 2.3.1

- This port will have the latest OpenZFS release version
- Bump PORTEPOCH
- Take maintainership

3 files changed, 151 insertions, 21 deletions

diff --git a/filesystems/openzfs/Makefile b/filesystems/openzfs/Makefile
index 4ea52a6aa29f..a62e4223557f 100644
--- a/filesystems/openzfs/Makefile
+++ b/filesystems/openzfs/Makefile
@@ -1,10 +1,11 @@
 PORTNAME=	openzfs
-PORTVERSION=	2023113000
-DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTVERSION=	2.3.1
+PORTEPOCH=	1
 CATEGORIES=	filesystems sysutils
+MASTER_SITES=   https://github.com/openzfs/zfs/releases/download/zfs-${PORTVERSION}/
+DISTNAME=	zfs-${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mm@FreeBSD.org
 COMMENT=	OpenZFS userland for FreeBSD
 WWW=		https://github.com/openzfs/zfs
 
@@ -16,7 +17,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:filesystems/openzfs-kmod
 
-USES+=		autoreconf:build cpe libtool gmake gettext-runtime python:build shebangfix ssl
+USES+=		cpe libtool gettext-runtime gmake 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 \
@@ -33,10 +34,6 @@ PYTHON_DESC=	Build the pyzfs library, arc_summary, arcstat, and dbufstat utiliti
 TESTS_DESC=	Install the ZFS Test Suite
 OPTIONS_SUB=	yes
 
-USE_GITHUB=	yes
-GH_PROJECT=	zfs
-GH_TAGNAME=	494aaae
-
 USE_LDCONFIG=	yes
 
 .include <bsd.port.options.mk>
@@ -65,7 +62,4 @@ post-extract:
 		cmd/dbufstat.in \
 		cmd/zilstat.in
 
-pre-configure:
-	cd ${WRKSRC} && ./autogen.sh
-
 .include <bsd.port.mk>
diff --git a/filesystems/openzfs/distinfo b/filesystems/openzfs/distinfo
index 6b9911e58395..98479a288312 100644
--- a/filesystems/openzfs/distinfo
+++ b/filesystems/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1701967689
-SHA256 (openzfs-zfs-v2023113000-494aaae_GH0.tar.gz) = 7f77e73bacb7bb081e3344fb20e5ebffd6a6c0b10cad1b6c572d44866a94eea6
-SIZE (openzfs-zfs-v2023113000-494aaae_GH0.tar.gz) = 33039586
+TIMESTAMP = 1743065095
+SHA256 (zfs-2.3.1.tar.gz) = 053233799386920bdc636e22d0e19a8c2c3e642e8bd847ff87e108f8bb1f9006
+SIZE (zfs-2.3.1.tar.gz) = 34048716
diff --git a/filesystems/openzfs/pkg-plist b/filesystems/openzfs/pkg-plist
index ea46b291888d..c61f6ba63967 100644
--- a/filesystems/openzfs/pkg-plist
+++ b/filesystems/openzfs/pkg-plist
@@ -4,6 +4,7 @@
 %%PYTHON%%bin/zilstat
 %%TESTS%%bin/raidz_test
 etc/bash_completion.d/zfs
+etc/bash_completion.d/zpool
 etc/sudoers.d/zfs
 etc/zfs/vdev_id.conf.alias.example
 etc/zfs/vdev_id.conf.multipath.example
@@ -65,6 +66,7 @@ include/libspl/string.h
 include/libspl/sys/acl.h
 include/libspl/sys/acl_impl.h
 include/libspl/sys/asm_linkage.h
+include/libspl/sys/backtrace.h
 include/libspl/sys/byteorder.h
 include/libspl/sys/callb.h
 include/libspl/sys/cmn_err.h
@@ -119,6 +121,7 @@ include/libzfs/libnvpair.h
 include/libzfs/libuutil.h
 include/libzfs/libuutil_common.h
 include/libzfs/libuutil_impl.h
+include/libzfs/libzdb.h
 include/libzfs/libzfs.h
 include/libzfs/libzfs_core.h
 include/libzfs/libzfsbootenv.h
@@ -148,6 +151,7 @@ include/libzfs/sys/crypto/icp.h
 include/libzfs/sys/dataset_kstats.h
 include/libzfs/sys/dbuf.h
 include/libzfs/sys/ddt.h
+include/libzfs/sys/ddt_impl.h
 include/libzfs/sys/dmu.h
 include/libzfs/sys/dmu_impl.h
 include/libzfs/sys/dmu_objset.h
@@ -269,7 +273,6 @@ include/libzfs/sys/zio_checksum.h
 include/libzfs/sys/zio_compress.h
 include/libzfs/sys/zio_crypt.h
 include/libzfs/sys/zio_impl.h
-include/libzfs/sys/zio_priority.h
 include/libzfs/sys/zrlock.h
 include/libzfs/sys/zstd/zstd.h
 include/libzfs/sys/zthr.h
@@ -280,6 +283,9 @@ include/libzfs/zfs_deleg.h
 include/libzfs/zfs_fletcher.h
 include/libzfs/zfs_namecheck.h
 include/libzfs/zfs_prop.h
+include/libzfs/zfs_valstr.h
+include/libzpool/abd_impl_os.h
+include/libzpool/abd_os.h
 lib/libnvpair.a
 lib/libnvpair.so
 lib/libnvpair.so.3
@@ -290,8 +296,8 @@ lib/libuutil.so.3
 lib/libuutil.so.3.0.0
 lib/libzfs.a
 lib/libzfs.so
-lib/libzfs.so.4
-lib/libzfs.so.4.1.0
+lib/libzfs.so.6
+lib/libzfs.so.6.0.0
 lib/libzfs_core.a
 lib/libzfs_core.so
 lib/libzfs_core.so.3
@@ -302,8 +308,8 @@ lib/libzfsbootenv.so.1
 lib/libzfsbootenv.so.1.0.0
 lib/libzpool.a
 lib/libzpool.so
-lib/libzpool.so.5
-lib/libzpool.so.5.0.0
+lib/libzpool.so.6
+lib/libzpool.so.6.0.0
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_constants%%PYTHON_EXT_SUFFIX%%.pyc
@@ -464,6 +470,7 @@ share/man/man8/zpool-clear.8.gz
 share/man/man8/zpool-create.8.gz
 share/man/man8/zpool-destroy.8.gz
 share/man/man8/zpool-detach.8.gz
+share/man/man8/zpool-ddtprune.8.gz
 share/man/man8/zpool-events.8.gz
 share/man/man8/zpool-export.8.gz
 share/man/man8/zpool-get.8.gz
@@ -475,6 +482,7 @@ share/man/man8/zpool-labelclear.8.gz
 share/man/man8/zpool-list.8.gz
 share/man/man8/zpool-offline.8.gz
 share/man/man8/zpool-online.8.gz
+share/man/man8/zpool-prefetch.8.gz
 share/man/man8/zpool-reguid.8.gz
 share/man/man8/zpool-remove.8.gz
 share/man/man8/zpool-reopen.8.gz
@@ -521,6 +529,8 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/compatibility.d/freenas-11.3
 %%TESTS%%share/zfs/compatibility.d/freenas-9.10.2
 %%TESTS%%share/zfs/compatibility.d/grub2
+%%TESTS%%share/zfs/compatibility.d/grub2-2.06
+%%TESTS%%share/zfs/compatibility.d/grub2-2.12
 %%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
@@ -528,6 +538,10 @@ share/pam-configs/zfs_key
 %%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/openzfs-2.3
+%%TESTS%%share/zfs/compatibility.d/openzfs-2.3-freebsd
+%%TESTS%%share/zfs/compatibility.d/openzfs-2.3-linux
+%%TESTS%%share/zfs/compatibility.d/openzfsonosx-1.7.0
 %%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
@@ -541,6 +555,7 @@ share/pam-configs/zfs_key
 %%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
+%%TESTS%%share/zfs/runfiles/bclone.run
 %%TESTS%%share/zfs/runfiles/common.run
 %%TESTS%%share/zfs/runfiles/freebsd.run
 %%TESTS%%share/zfs/runfiles/linux.run
@@ -557,6 +572,9 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/bin/blake3_test
 %%TESTS%%share/zfs/zfs-tests/bin/btree_test
 %%TESTS%%share/zfs/zfs-tests/bin/chg_usr_exec
+%%TESTS%%share/zfs/zfs-tests/bin/clone_mmap_cached
+%%TESTS%%share/zfs/zfs-tests/bin/clone_mmap_write
+%%TESTS%%share/zfs/zfs-tests/bin/clonefile
 %%TESTS%%share/zfs/zfs-tests/bin/cp_files
 %%TESTS%%share/zfs/zfs-tests/bin/ctime
 %%TESTS%%share/zfs/zfs-tests/bin/dir_rd_update
@@ -571,6 +589,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/bin/get_diff
 %%TESTS%%share/zfs/zfs-tests/bin/largest_file
 %%TESTS%%share/zfs/zfs-tests/bin/libzfs_input_check
+%%TESTS%%share/zfs/zfs-tests/bin/manipulate_user_buffer
 %%TESTS%%share/zfs/zfs-tests/bin/mkbusy
 %%TESTS%%share/zfs/zfs-tests/bin/mkfile
 %%TESTS%%share/zfs/zfs-tests/bin/mkfiles
@@ -599,6 +618,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/include/blkdev.shlib
 %%TESTS%%share/zfs/zfs-tests/include/commands.cfg
 %%TESTS%%share/zfs/zfs-tests/include/default.cfg
+%%TESTS%%share/zfs/zfs-tests/include/kstat.shlib
 %%TESTS%%share/zfs/zfs-tests/include/libtest.shlib
 %%TESTS%%share/zfs/zfs-tests/include/math.shlib
 %%TESTS%%share/zfs/zfs-tests/include/properties.shlib
@@ -661,18 +681,47 @@ 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/bclone/bclone.cfg
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_common.kshlib
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_corner_cases.kshlib
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_crossfs_corner_cases.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_crossfs_corner_cases_limited.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_crossfs_data.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_crossfs_embedded.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_crossfs_hole.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_diffprops_all.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_diffprops_checksum.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_diffprops_compress.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_diffprops_copies.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_diffprops_recordsize.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_prop_sync.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_samefs_corner_cases.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_samefs_corner_cases_limited.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_samefs_data.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_samefs_embedded.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/bclone_samefs_hole.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/cleanup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/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_clone_mmap_cached.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_clone_mmap_write.ksh
 %%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_cross_enc_dataset.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/block_cloning_large_offset.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_lwb_buffer_overflow.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_replay.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_replay_encrypted.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_rlimit_fsize.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
@@ -848,6 +897,9 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/clean_mirror/default.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/clean_mirror/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/cli_common.kshlib
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/json/cleanup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/json/json_sanity.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/json/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_003_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zdb/zdb_004_pos.ksh
@@ -1032,6 +1084,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_fail.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_mountpoints.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_encrypted.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_recursive.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_remount.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_multi_mount.ksh
@@ -1184,6 +1237,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_011_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_012_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_013_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_after_mount.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_concurrent_shares.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_snapshot/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_snapshot/setup.ksh
@@ -1251,6 +1305,9 @@ 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/zinject/zinject_args.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zinject/zinject_counts.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zinject/zinject_probe.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
@@ -1371,6 +1428,8 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_003_neg.ksh
 %%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_export/zpool_export_parallel_admin.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_parallel_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
@@ -1437,7 +1496,11 @@ share/pam-configs/zfs_key
 %%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
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_parallel_admin.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_parallel_neg.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_parallel_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_rename_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_status.ksh
 %%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
@@ -1467,6 +1530,13 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_online/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_online/zpool_online_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_online/zpool_online_002_neg.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_prefetch/cleanup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_prefetch/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_prefetch/zpool_prefetch_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_reguid/cleanup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_reguid/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_reguid/zpool_reguid_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_reguid/zpool_reguid_002_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_remove/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_remove/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_remove/zpool_remove.cfg
@@ -1511,6 +1581,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_multiple_copies.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_offline_device.ksh
 %%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_scrub/zpool_scrub_txg_continue_from_last.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
@@ -1543,6 +1614,7 @@ share/pam-configs/zfs_key
 %%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_008_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
@@ -1755,6 +1827,9 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/compression/testpool_zstd.tar.gz
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/cp_files_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/cp_files_002_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/cp_stress.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/seekflood
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/crtime/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/crtime/crtime_001_pos.ksh
@@ -1766,6 +1841,15 @@ share/pam-configs/zfs_key
 %%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/dedup/cleanup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_fdt_create.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_fdt_import.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_legacy_create.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_legacy_fdt_mixed.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_legacy_fdt_upgrade.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_legacy_import.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_quota.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/delegate/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/delegate/delegate.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/delegate/delegate_common.kshlib
@@ -1797,6 +1881,30 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/devices/devices_003_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/devices/devices_common.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/devices/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/cleanup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio.cfg
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio.kshlib
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_aligned_block.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_async_always.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_async_fio_ioengines.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_compression.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_dedup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_encryption.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_grow_block.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_loopback_dev.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_max_recordsize.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_mixed.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_mmap.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_overwrites.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_property.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_random.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_read_verify.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_recordsize.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_unaligned_block.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_unaligned_filesize.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_write_stable_pages.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/dio_write_verify.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/direct/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/dos_attributes/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/dos_attributes/read_dos_attrs_001.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/dos_attributes/setup.ksh
@@ -1809,9 +1917,12 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/zed_cksum_config.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/zed_cksum_reported.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/events/zed_diagnose_multiple.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/zed_fd_spill.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/zed_io_config.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/events/zed_rc_filter.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/events/zed_slow_io.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/events/zed_slow_io_many_vdevs.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/exec/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/exec/exec_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/exec/exec_002_neg.ksh
@@ -1838,8 +1949,11 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/fault/decompress_fault.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/fault/decrypt_fault.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/fault/fault.cfg
+%%TESTS%%share/zfs/zfs-tests/tests/functional/fault/fault_limits.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/fault/scrub_after_resilver.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/fault/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/fault/suspend_on_probe_errors.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/fault/suspend_resume_single.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/fault/zpool_status_-s.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/features/async_destroy/async_destroy_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/features/async_destroy/cleanup.ksh
@@ -1991,6 +2105,11 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/link_count/link_count_root_inode.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/link_count/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/log_spacemap/log_spacemap_import_logs.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/longname/cleanup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/longname/longname_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/longname/longname_002_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/longname/longname_003_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/longname/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/migration/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/migration/migration.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/migration/migration.kshlib
@@ -2030,6 +2149,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/mmp/mmp_reset_interval.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/mmp/mmp_write_distribution.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/mmp/mmp_write_slow_disk.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/mmp/mmp_write_uberblocks.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/mmp/multihost_history.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/mmp/setup.ksh
@@ -2077,6 +2197,7 @@ share/pam-configs/zfs_key
 %%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_mount_recursively.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
@@ -2158,7 +2279,15 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_001_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_003_pos.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_004_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_004_pos.ksr
+%%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_expand_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_expand_002_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_expand_003_neg.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_expand_003_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_expand_004_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_expand_005_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_expand_006_neg.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_expand_007_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/redacted.cfg
@@ -2240,6 +2369,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_hole.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
@@ -2349,6 +2479,7 @@ share/pam-configs/zfs_key
 %%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
+%%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send-c_longname.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send-c_lz4_disabled.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send-c_mixed_compression.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send-c_props.ksh
@@ -2482,6 +2613,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/upgrade/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/upgrade/upgrade_common.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/upgrade/upgrade_projectquota_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/upgrade/upgrade_projectquota_002_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/upgrade/upgrade_readonly_pool.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/upgrade/upgrade_userobj_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/user_namespace/cleanup.ksh
@@ -2519,6 +2651,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/userquota/userspace_encrypted.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/userquota/userspace_encrypted_13709.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/userquota/userspace_send_encrypted.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/vdev_disk/page_alignment
 %%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
@@ -2551,6 +2684,9 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/xattr/xattr_013_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/xattr/xattr_common.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/xattr/xattr_compat.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/zap_shrink/cleanup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/zap_shrink/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/zap_shrink/zap_shrink_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/zpool_influxdb/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/zpool_influxdb/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/zpool_influxdb/zpool_influxdb.ksh