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

Conflicts:
	cmd/ztest/ztest.c
	lib/libzpool/include/sys/zfs_context.h
	lib/libzpool/kernel.c
	lib/libzpool/taskq.c

diff --cc cmd/ztest/ztest.c
index b2d3ea74220b7bbad31aa690d5a2bb90ab4088c8,e933c8d69eb551d8d8c7b54ff5b97d58126fbc12..16fc58e7e40bf1cc38661ebe0e30ce456e188d7c
--- 1/cmd/ztest/ztest.c
--- 2/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@@ -2562,9 -2555,9 +2560,9 @@@ 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[SPA_MAXBLOCKSIZE];
 +      char *iobuf;
        blkptr_t blk = { 0 };
        uint64_t blkoff;
        zbookmark_t zb;

diff --cc lib/libzpool/include/sys/zfs_context.h
index 522d860ab6316f153e018d0df07959e5abc57965,230c233a242c369a88c662f4006aea8702cf4726..327f817856ee1695651533509d3f596ef2778f99
--- 1/lib/libzpool/include/sys/zfs_context.h
--- 2/lib/libzpool/include/sys/zfs_context.h
+++ b/lib/libzpool/include/sys/zfs_context.h
@@@ -351,9 -330,8 +330,8 @@@ extern taskq_t     *taskq_create(const cha
  extern taskqid_t taskq_dispatch(taskq_t *, task_func_t, void *, uint_t);
  extern void   taskq_destroy(taskq_t *);
  extern void   taskq_wait(taskq_t *);
 -extern int    taskq_member(taskq_t *, void *);
 +extern int    taskq_member(taskq_t *, kthread_t *);
  extern void   system_taskq_init(void);
- extern void   system_taskq_fini(void);
  
  #define       XVA_MAPSIZE     3
  #define       XVA_MAGIC       0x78766174

diff --cc lib/libzpool/taskq.c
Simple merge