Recreate feature-branch to simply feature merge

diff --git a/.topdeps b/.topdeps
index 1f7391f92b6a3792204e07e99f71f643cc35e7e1..9fdb648b9d80f05741e091316e598848d5447b71 100644 (file)
--- a/.topdeps
+++ b/.topdeps
@@ -1 +1 @@
-master
+feature-commit-cb

diff --git a/.topmsg b/.topmsg
index c3cc0c8de8abbe023f166ecc9e430ade0f80c760..56485000adc9491abc27acea6760cc3a238aae72 100644 (file)
--- a/.topmsg
+++ b/.topmsg
@@ -1,12 +1,6 @@
 From: Brian Behlendorf <behlendorf1@llnl.gov>
-Subject: [PATCH] feature commit cb
+Subject: [PATCH] feature branch
 
-ZFS commit callbacks (v3) some version of this support is expected
-to appear in an official release from the core ZFS team.
-
-NOTE: The ztest test case was dropped because it assumed userspace
-pthreads support.  We should certainly keep the test case but the
-user space modification should be properly written to handle and
-kernel space build as well.
+Merged result of all expected upstream ZFS features
 
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>