Index: head/sysutils/openzfs-kmod/Makefile
===================================================================
--- head/sysutils/openzfs-kmod/Makefile
+++ head/sysutils/openzfs-kmod/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openzfs
-PORTVERSION=	2020022700
+PORTVERSION=	2020031600
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-kmod
@@ -15,7 +15,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	zfsonfreebsd
 GH_PROJECT=	ZoF
-GH_TAGNAME=	5db583ba1
+GH_TAGNAME=	152cc960a
 KMODTARGET?=	openzfs.ko
 
 PLIST_FILES=	${KMODDIR}/${KMODTARGET}
Index: head/sysutils/openzfs-kmod/distinfo
===================================================================
--- head/sysutils/openzfs-kmod/distinfo
+++ head/sysutils/openzfs-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582818967
-SHA256 (zfsonfreebsd-ZoF-v2020022700-5db583ba1_GH0.tar.gz) = 6d28666b69c24f9eb9692e41c732b28d196276f291bc0204e0427fb15faa28ed
-SIZE (zfsonfreebsd-ZoF-v2020022700-5db583ba1_GH0.tar.gz) = 6800853
+TIMESTAMP = 1584339428
+SHA256 (zfsonfreebsd-ZoF-v2020031600-152cc960a_GH0.tar.gz) = 6cd0a80e621e8fdaad7563052b0d597212cec9548f847fd6189c09b5d6413dd5
+SIZE (zfsonfreebsd-ZoF-v2020031600-152cc960a_GH0.tar.gz) = 6806435
Index: head/sysutils/openzfs/Makefile
===================================================================
--- head/sysutils/openzfs/Makefile
+++ head/sysutils/openzfs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openzfs
-PORTVERSION=	2020022700
+PORTVERSION=	2020031600
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -28,7 +28,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	zfsonfreebsd
 GH_PROJECT=	ZoF
-GH_TAGNAME=	5db583ba1
+GH_TAGNAME=	152cc960a
 
 .include <bsd.port.pre.mk>
 
Index: head/sysutils/openzfs/distinfo
===================================================================
--- head/sysutils/openzfs/distinfo
+++ head/sysutils/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582819041
-SHA256 (zfsonfreebsd-ZoF-v2020022700-5db583ba1_GH0.tar.gz) = 6d28666b69c24f9eb9692e41c732b28d196276f291bc0204e0427fb15faa28ed
-SIZE (zfsonfreebsd-ZoF-v2020022700-5db583ba1_GH0.tar.gz) = 6800853
+TIMESTAMP = 1584339511
+SHA256 (zfsonfreebsd-ZoF-v2020031600-152cc960a_GH0.tar.gz) = 6cd0a80e621e8fdaad7563052b0d597212cec9548f847fd6189c09b5d6413dd5
+SIZE (zfsonfreebsd-ZoF-v2020031600-152cc960a_GH0.tar.gz) = 6806435
Index: head/sysutils/openzfs/pkg-plist
===================================================================
--- head/sysutils/openzfs/pkg-plist
+++ head/sysutils/openzfs/pkg-plist
@@ -8,6 +8,7 @@
 etc/zfs/vdev_id.conf.sas_direct.example
 etc/zfs/vdev_id.conf.sas_switch.example
 etc/zfs/vdev_id.conf.scsi.example
+etc/zfs/zfs-functions
 etc/zfs/zpool.d/ata_err
 etc/zfs/zpool.d/cmd_to
 etc/zfs/zpool.d/defect
@@ -507,6 +508,7 @@
 %%TESTS%%share/zfs/zfs-tests/bin/threadsappend
 %%TESTS%%share/zfs/zfs-tests/callbacks/zfs_dbgmsg.ksh
 %%TESTS%%share/zfs/zfs-tests/callbacks/zfs_dmesg.ksh
+%%TESTS%%share/zfs/zfs-tests/callbacks/zfs_failsafe.ksh
 %%TESTS%%share/zfs/zfs-tests/callbacks/zfs_mmp.ksh
 %%TESTS%%share/zfs/zfs-tests/include/blkdev.shlib
 %%TESTS%%share/zfs/zfs-tests/include/commands.cfg
@@ -878,7 +880,7 @@
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_009_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_010_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_011_neg.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_012_neg.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_012_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_001_pos.ksh
 %%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
@@ -1433,6 +1435,9 @@
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_no_activity.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_remove.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_remove_cancel.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_trim_basic.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_trim_cancel.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_trim_flag.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_usage.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_user/misc/arc_summary_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_user/misc/arc_summary_002_neg.ksh