Merge commit 'refs/top-bases/fix-list' into fix-list

Conflicts:

	module/zfs/arc.c

diff --cc module/zfs/arc.c
index fee6031ea9b7b2427d2abd66d9ef2e01fc1aa4a1,3a9598a926b248c7987d681e9d07f91e5fb75758..6313a15f75bab8f9a8369f3e90a27cc257e6f982
--- 1/module/zfs/arc.c
--- 2/module/zfs/arc.c
+++ b/module/zfs/arc.c
@@@ -755,10 -777,8 +777,13 @@@ 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);
++<<<<<<< HEAD:module/zfs/arc.c
 +      list_link_init(&buf->b_arc_node);
 +      list_link_init(&buf->b_l2node);
++=======
+       arc_space_consume(sizeof (arc_buf_hdr_t), ARC_SPACE_HDRS);
++>>>>>>> refs/top-bases/fix-list:module/zfs/arc.c
  
-       ARCSTAT_INCR(arcstat_hdr_size, HDR_SIZE);
        return (0);
  }
  
@@@ -4355,7 -4505,7 +4510,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/dsl_dataset.c
Simple merge

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