Merge branch 'feature-branch' into refs/top-bases/zfs-branch

diff --cc cmd/zdb/zdb.c
Simple merge

diff --cc cmd/zinject/translate.c
Simple merge

diff --cc cmd/ztest/ztest.c
index 3fff7f416f43f19b6af5a0ae91b7ffe63787a1ac,16fc58e7e40bf1cc38661ebe0e30ce456e188d7c..4f8ca0d6bb24e073805c4038374e591545f6b583
--- 1/cmd/ztest/ztest.c
--- 2/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@@ -2575,10 -2560,10 +2573,10 @@@ ztest_dmu_write_parallel(ztest_args_t *
        int bs = ZTEST_DIROBJ_BLOCKSIZE;
        int do_free = 0;
        uint64_t off, txg, txg_how;
-       kmutex_t *lp;
+       mutex_t *lp;
        char osname[MAXNAMELEN];
        char *iobuf;
 -      blkptr_t blk = { 0 };
 +      blkptr_t blk;
        uint64_t blkoff;
        zbookmark_t zb;
        dmu_tx_t *tx = dmu_tx_create(os);

diff --cc lib/libuutil/uu_misc.c
Simple merge

diff --cc lib/libzpool/include/sys/zfs_context.h
Simple merge

diff --cc lib/libzpool/kernel.c
index 21e03936515a5a75d13e4d0d94818aeb86a49fb1,89108fe5b2b1bf0950eeec985282701da4a9a355..7f6c37da0865406ac0b3c8b98d1a06bdc93a5d6c
--- 1/lib/libzpool/kernel.c
--- 2/lib/libzpool/kernel.c
+++ b/lib/libzpool/kernel.c
@@@ -35,8 -34,8 +34,7 @@@
  #include <sys/stat.h>
  #include <sys/processor.h>
  #include <sys/zfs_context.h>
 -#include <sys/zmod.h>
  #include <sys/utsname.h>
- #include <sys/time.h>
  #include <sys/systeminfo.h>
  
  /*