diff --git a/.topdeps b/.topdeps index 1f7391f92b..9fdb648b9d 100644 --- a/.topdeps +++ b/.topdeps @@ -1 +1 @@ -master +feature-commit-cb diff --git a/.topmsg b/.topmsg index c3cc0c8de8..56485000ad 100644 --- a/.topmsg +++ b/.topmsg @@ -1,12 +1,6 @@ From: Brian Behlendorf -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