Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

diff --cc cmd/ztest/ztest.c
index df0cabed9c5702b1f4b549fab6bfab1d0f6f5d22,746db0c070a5d991aa8239d9c1f854541436c868..ed78eb942882883937209ca1473c5c45fd1326a5
--- 1/cmd/ztest/ztest.c
--- 2/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@@ -162,9 -164,9 +164,10 @@@ typedef void ztest_func_t(ztest_args_t 
   * Note: these aren't static because we want dladdr() to work.
   */
  ztest_func_t ztest_dmu_read_write;
+ ztest_func_t ztest_dmu_read_write_zcopy;
  ztest_func_t ztest_dmu_write_parallel;
  ztest_func_t ztest_dmu_object_alloc_free;
 +ztest_func_t ztest_dmu_commit_callbacks;
  ztest_func_t ztest_zap;
  ztest_func_t ztest_zap_parallel;
  ztest_func_t ztest_traverse;
@@@ -197,9 -200,9 +201,10 @@@ uint64_t zopt_rarely = 60;                /* every 6
  
  ztest_info_t ztest_info[] = {
        { ztest_dmu_read_write,                 1,      &zopt_always    },
+       { ztest_dmu_read_write_zcopy,           1,      &zopt_always    },
        { ztest_dmu_write_parallel,             30,     &zopt_always    },
        { ztest_dmu_object_alloc_free,          1,      &zopt_always    },
 +      { ztest_dmu_commit_callbacks,           10,     &zopt_always    },
        { ztest_zap,                            30,     &zopt_always    },
        { ztest_zap_parallel,                   100,    &zopt_always    },
        { ztest_dsl_prop_get_set,               1,      &zopt_sometimes },

diff --cc module/zfs/dmu_tx.c
Simple merge

diff --cc module/zfs/include/sys/dmu.h
Simple merge