Index: head/sysutils/openzfs-kmod/Makefile
===================================================================
--- head/sysutils/openzfs-kmod/Makefile
+++ head/sysutils/openzfs-kmod/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openzfs
-PORTVERSION=	2020060300
+PORTVERSION=	2020061800
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-kmod
@@ -17,7 +17,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	openzfs
 GH_PROJECT=	zfs
-GH_TAGNAME=	c0eb5c35e
+GH_TAGNAME=	2e6af52b2
 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 = 1591206915
-SHA256 (openzfs-zfs-v2020060300-c0eb5c35e_GH0.tar.gz) = 91f65373ccb618aa31f44f998ed0d7474b52591befbc3eb8bc73fbf81e4b2dde
-SIZE (openzfs-zfs-v2020060300-c0eb5c35e_GH0.tar.gz) = 9171145
+TIMESTAMP = 1592524177
+SHA256 (openzfs-zfs-v2020061800-2e6af52b2_GH0.tar.gz) = 2795ad9fbcd4cef77b1e879b18ecb8d2640fe5c4a64b12396c24c6d9bf05d541
+SIZE (openzfs-zfs-v2020061800-2e6af52b2_GH0.tar.gz) = 9179319
Index: head/sysutils/openzfs/Makefile
===================================================================
--- head/sysutils/openzfs/Makefile
+++ head/sysutils/openzfs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openzfs
-PORTVERSION=	2020060300
+PORTVERSION=	2020061800
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -28,7 +28,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	openzfs
 GH_PROJECT=	zfs
-GH_TAGNAME=	c0eb5c35e
+GH_TAGNAME=	2e6af52b2
 
 .include <bsd.port.pre.mk>
 
Index: head/sysutils/openzfs/distinfo
===================================================================
--- head/sysutils/openzfs/distinfo
+++ head/sysutils/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591206993
-SHA256 (openzfs-zfs-v2020060300-c0eb5c35e_GH0.tar.gz) = 91f65373ccb618aa31f44f998ed0d7474b52591befbc3eb8bc73fbf81e4b2dde
-SIZE (openzfs-zfs-v2020060300-c0eb5c35e_GH0.tar.gz) = 9171145
+TIMESTAMP = 1592523411
+SHA256 (openzfs-zfs-v2020061800-2e6af52b2_GH0.tar.gz) = 2795ad9fbcd4cef77b1e879b18ecb8d2640fe5c4a64b12396c24c6d9bf05d541
+SIZE (openzfs-zfs-v2020061800-2e6af52b2_GH0.tar.gz) = 9179319
Index: head/sysutils/openzfs/pkg-plist
===================================================================
--- head/sysutils/openzfs/pkg-plist
+++ head/sysutils/openzfs/pkg-plist
@@ -12,6 +12,7 @@
 etc/zfs/zpool.d/ata_err
 etc/zfs/zpool.d/cmd_to
 etc/zfs/zpool.d/defect
+etc/zfs/zpool.d/dm-deps
 etc/zfs/zpool.d/enc
 etc/zfs/zpool.d/encdev
 etc/zfs/zpool.d/fault_led
@@ -37,7 +38,6 @@
 etc/zfs/zpool.d/serial
 etc/zfs/zpool.d/ses
 etc/zfs/zpool.d/size
-etc/zfs/zpool.d/slaves
 etc/zfs/zpool.d/slot
 etc/zfs/zpool.d/smart
 etc/zfs/zpool.d/smart_test
@@ -333,6 +333,7 @@
 libexec/zfs/zpool.d/ata_err
 libexec/zfs/zpool.d/cmd_to
 libexec/zfs/zpool.d/defect
+libexec/zfs/zpool.d/dm-deps
 libexec/zfs/zpool.d/enc
 libexec/zfs/zpool.d/encdev
 libexec/zfs/zpool.d/fault_led
@@ -358,7 +359,6 @@
 libexec/zfs/zpool.d/serial
 libexec/zfs/zpool.d/ses
 libexec/zfs/zpool.d/size
-libexec/zfs/zpool.d/slaves
 libexec/zfs/zpool.d/slot
 libexec/zfs/zpool.d/smart
 libexec/zfs/zpool.d/smart_test
@@ -1595,6 +1595,10 @@
 %%TESTS%%share/zfs/zfs-tests/tests/functional/exec/exec_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/exec/exec_002_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/exec/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/fallocate/cleanup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/fallocate/fallocate_prealloc.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/fallocate/fallocate_punch-hole.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/fallocate/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/fault/auto_offline_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/fault/auto_online_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/fault/auto_replace_001_pos.ksh
@@ -2058,6 +2062,7 @@
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_021_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_022_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/rsend_024_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
 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send-c_lz4_disabled.ksh
@@ -2172,6 +2177,7 @@
 %%TESTS%%share/zfs/zfs-tests/tests/functional/trim/trim.kshlib
 %%TESTS%%share/zfs/zfs-tests/tests/functional/trim/trim_config.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/trim/trim_integrity.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/trim/trim_l2arc.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/truncate/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/truncate/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/truncate/truncate.cfg