3582 zfs_delay() should support a variable resolution
3584 DTrace sdt probes for ZFS txg states
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Richard Elling <richard.elling@dey-sys.com>
Approved by: Garrett D'Amore <garrett@damore.org>
3551 hvm_sd module missing dependencies on scsi and cmlb
Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Gordon Ross <gwr@nexenta.com>
3603 panic from bpobj_enqueue_subobj()
3604 zdb should print bpobjs more verbosely
Reviewed by: Henrik Mattson <henrik.mattson@delphix.com>
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Dan McDonald <danmcd@nexenta.com>
3530 ::smbsess prints wrong IP addresses in verbose mode, has no idea about IPv6
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Marcel Telka <marcel.telka@nexenta.com>
Reviewed by: Bayard Bell <Bayard.Bell@nexenta.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Richard Lowe <richlowe@richlowe.net>
Merge /root/git/illumos-gate

* /root/git/illumos-gate:

commit 41610d101ac089e52e33b0a671581e0c80d256c0
    3530 ::smbsess prints wrong IP addresses in verbose mode, has no idea about IPv6
commit d04756377ddd1cf28ebcf652541094e17b03c889
    3603 panic from bpobj_enqueue_subobj()
    3604 zdb should print bpobjs more verbosely
commit df49e4e49391204d49b62e99bfae86101a20c690
    3551 hvm_sd module missing dependencies on scsi and cmlb
commit 0689f76c08c5e553ff25ac43a852b56c430bb61e
    3582 zfs_delay() should support a variable resolution
    3584 DTrace sdt probes for ZFS txg states

Conflicts:
	usr/src/uts/common/fs/zfs/dsl_dir.c
	usr/src/uts/common/fs/zfs/dsl_pool.c
Merge branch 'master' of github.com:joyent/illumos-joyent

* 'master' of github.com:joyent/illumos-joyent:
  OS-1988 Make ldi_ev_remove_callbacks safe to use in LDI callbacks Reviewed by: Robert Mustacchi <rm@joyent.com>