Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch

Conflicts:

	lib/libzpool/kernel.c
	module/zfs/arc.c

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

diff --cc lib/libzpool/kernel.c
index 52da483e002dea533cb038803b7ee9ae09fa4724,89108fe5b2b1bf0950eeec985282701da4a9a355..66ee516b3b3021083041137cb4509b5d7f3f6505
--- 1/lib/libzpool/kernel.c
--- 2/lib/libzpool/kernel.c
+++ b/lib/libzpool/kernel.c
@@@ -34,8 -34,9 +34,9 @@@
  #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>
  
  /*
   * Emulation of kernel services in userland.

diff --cc module/zfs/arc.c
index fd11c1a0c62310c089d558877b0156705558dab7,2947dfcbee489898db463014411aa35e388e099d..5b38cf30f66c88cad2cc161cb394ee199b365a22
--- 1/module/zfs/arc.c
--- 2/module/zfs/arc.c
+++ b/module/zfs/arc.c
@@@ -755,10 -777,8 +777,10 @@@ hdr_cons(void *vbuf, void *unused, int 
        refcount_create(&buf->b_refcnt);
        cv_init(&buf->b_cv, NULL, CV_DEFAULT, NULL);
        mutex_init(&buf->b_freeze_lock, NULL, MUTEX_DEFAULT, NULL);
 +      list_link_init(&buf->b_arc_node);
 +      list_link_init(&buf->b_l2node);
+       arc_space_consume(sizeof (arc_buf_hdr_t), ARC_SPACE_HDRS);
  
-       ARCSTAT_INCR(arcstat_hdr_size, HDR_SIZE);
        return (0);
  }
  
@@@ -4355,7 -4505,7 +4507,8 @@@ l2arc_add_vdev(spa_t *spa, vdev_t *vd, 
        adddev->l2ad_hand = adddev->l2ad_start;
        adddev->l2ad_evict = adddev->l2ad_start;
        adddev->l2ad_first = B_TRUE;
+       adddev->l2ad_writing = B_FALSE;
 +      list_link_init(&adddev->l2ad_node);
        ASSERT3U(adddev->l2ad_write, >, 0);
  
        /*

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

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

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

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

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

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

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