diff --git a/sysutils/openzfs-kmod/Makefile b/sysutils/openzfs-kmod/Makefile
index a3ea8041aa81..98d16070fa72 100644
--- a/sysutils/openzfs-kmod/Makefile
+++ b/sysutils/openzfs-kmod/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openzfs
-PORTVERSION=	2021062100
+PORTVERSION=	2021073000
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-kmod
@@ -15,7 +15,7 @@ USES=		kmod
 USE_GITHUB=	yes
 GH_ACCOUNT=	openzfs
 GH_PROJECT=	zfs
-GH_TAGNAME=	ba9131156
+GH_TAGNAME=	7eebcd2be
 KMODTARGET?=	openzfs.ko
 
 PLIST_FILES=	${KMODDIR}/${KMODTARGET}
diff --git a/sysutils/openzfs-kmod/distinfo b/sysutils/openzfs-kmod/distinfo
index e2dcc433bf7c..6e7f35cbeb93 100644
--- a/sysutils/openzfs-kmod/distinfo
+++ b/sysutils/openzfs-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624292748
-SHA256 (openzfs-zfs-v2021062100-ba9131156_GH0.tar.gz) = dade85e4adcec42e21cfdf6b9ef7e0bdb94f2ef2e862f9caca4772d8f07aa487
-SIZE (openzfs-zfs-v2021062100-ba9131156_GH0.tar.gz) = 31369359
+TIMESTAMP = 1627689435
+SHA256 (openzfs-zfs-v2021073000-7eebcd2be_GH0.tar.gz) = d772cb29fa546f6146cbc9e9b1ff0295328dddbdfd5217439e7b7802d5f01d22
+SIZE (openzfs-zfs-v2021073000-7eebcd2be_GH0.tar.gz) = 31354088
diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile
index 03aa79cb05e8..b56678b01e4e 100644
--- a/sysutils/openzfs/Makefile
+++ b/sysutils/openzfs/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openzfs
-PORTVERSION=	2021062100
+PORTVERSION=	2021073000
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -26,7 +26,7 @@ OPTIONS_SUB=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	openzfs
 GH_PROJECT=	zfs
-GH_TAGNAME=	ba9131156
+GH_TAGNAME=	7eebcd2be
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/openzfs/distinfo b/sysutils/openzfs/distinfo
index 318a70804e4d..6ae1d3f5e0ed 100644
--- a/sysutils/openzfs/distinfo
+++ b/sysutils/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624292916
-SHA256 (openzfs-zfs-v2021062100-ba9131156_GH0.tar.gz) = dade85e4adcec42e21cfdf6b9ef7e0bdb94f2ef2e862f9caca4772d8f07aa487
-SIZE (openzfs-zfs-v2021062100-ba9131156_GH0.tar.gz) = 31369359
+TIMESTAMP = 1627689456
+SHA256 (openzfs-zfs-v2021073000-7eebcd2be_GH0.tar.gz) = d772cb29fa546f6146cbc9e9b1ff0295328dddbdfd5217439e7b7802d5f01d22
+SIZE (openzfs-zfs-v2021073000-7eebcd2be_GH0.tar.gz) = 31354088
diff --git a/sysutils/openzfs/pkg-plist b/sysutils/openzfs/pkg-plist
index 2179e6448ca8..f49fcb6aff62 100644
--- a/sysutils/openzfs/pkg-plist
+++ b/sysutils/openzfs/pkg-plist
@@ -197,7 +197,6 @@ include/libzfs/sys/mmp.h
 include/libzfs/sys/mntent.h
 include/libzfs/sys/mod.h
 include/libzfs/sys/multilist.h
-include/libzfs/sys/note.h
 include/libzfs/sys/nvpair.h
 include/libzfs/sys/nvpair_impl.h
 include/libzfs/sys/objlist.h
@@ -1279,6 +1278,7 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_006_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_007_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_008_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_009_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_tempname.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy.cfg
 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_001_pos.ksh
@@ -1733,6 +1733,7 @@ share/pam-configs/zfs_key
 %%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_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_spare_001_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/fault/auto_spare_002_pos.ksh
@@ -1868,9 +1869,6 @@ share/pam-configs/zfs_key
 %%TESTS%%share/zfs/zfs-tests/tests/functional/l2arc/persist_l2arc_003_neg.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/l2arc/persist_l2arc_004_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/l2arc/persist_l2arc_005_pos.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/l2arc/persist_l2arc_006_pos.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/l2arc/persist_l2arc_007_pos.ksh
-%%TESTS%%share/zfs/zfs-tests/tests/functional/l2arc/persist_l2arc_008_pos.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/l2arc/setup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/large_files/cleanup.ksh
 %%TESTS%%share/zfs/zfs-tests/tests/functional/large_files/large_files_001_pos.ksh