Merge branch 'fix-pthreads' into refs/top-bases/fix-branch

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

diff --cc lib/libzpool/kernel.c
index 66ee516b3b3021083041137cb4509b5d7f3f6505,89108fe5b2b1bf0950eeec985282701da4a9a355..34dfc77c589553ce857ce5b81892f7761331d04c
--- 1/lib/libzpool/kernel.c
--- 2/lib/libzpool/kernel.c
+++ b/lib/libzpool/kernel.c
@@@ -34,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>
  
  /*