4248 dtrace(1M) should never create DOF with empty probes section
4249 Only probes from the first DTrace object file will be included
Reviewed by: Adam Leventhal <ahl@delphix.com>
Approved by: Garrett D'Amore <garrett@damore.org>
4290 dlmgmtd is careless with avl_find
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
4236 Internet Packet Disturber
4237 net_* and hook_* man pages are wrong
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Brendan Gregg <brendan.gregg@joyent.com>
Reviewed by: Keith M Wesolowski <wesolows@foobazco.org>
Reviewed by: Sebastien Roy <seb@delphix.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
4245 boot_time kstat for zones should be epoch timestamp of zone boot, not "random" number
Reviewed by: Richard Elling <richard.elling@gmail.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Gordon Ross <gwr@nexenta.com>
4246 kstat read improperly returned ENOMEM
Reviewed by: Richard Elling <richard.elling@gmail.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Gordon Ross <gwr@nexenta.com>
4251 libdtrace leaks open file handles
4250 libdtrace should use "F" specifier on fopen()
Reviewed by: Marcel Telka <marcel.telka@nexenta.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Approved by: Eric Schrock <eric.schrock@delphix.com>
4116 kiconv_open(9f): kiconv_close() in the CONTEXT section
Reviewed by: Marcel Telka <marcel@telka.sk>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Robert Mustacchi <rm@joyent.com>
4243 sdev_access() race leads to panic
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Eric Schrock <eric.schrock@delphix.com>
4244 spawn fails occasionally with EAGAIN
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Approved by: Gordon Ross <gordon.ross@nexenta.com>
4161 deadlock between zfs_read() and zfs_putpage()
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>
Reviewed by: Ilya Usvyatsky <ilya.usvyatsky@nexenta.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
3928 `tail -f ...` doesn't notice file truncation
3929 `man tail` doesn't mentioned "-F" option
3930 'tail -F ...' not resetting the offset of file rotation properly
3968 want FILE_TRUNC event for PORT_SOURCE_FILE
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
4293 mdb typedef load error msg confusing
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Gordon Ross <gordon.ross@nexenta.com>
	[illumos-gate merge]

commit 72102e7461c97dc268d21d9dd8f02da45f174acd
    3928 `tail -f ...` doesn't notice file truncation
    3929 `man tail` doesn't mentioned "-F" option
    3930 'tail -F ...' not resetting the offset of file rotation properly
    3968 want FILE_TRUNC event for PORT_SOURCE_FILE
commit b3d32f0ceb59362ba287dcfd6de471e98bfc7fa9
    4161 deadlock between zfs_read() and zfs_putpage()
commit 5a450eee20035a2a426a48161ab3a50e2921878c
    4244 spawn fails occasionally with EAGAIN
commit 393cba3d826b7fd70b8ab083125c4b25c43ee482
    4116 kiconv_open(9f): kiconv_close() in the CONTEXT section
commit 86ad481cc8bfbc0155ef221a0fe07ef23db58f68
    4245 boot_time kstat for zones should be epoch timestamp of zone boot, not "random" number
commit fe77cc0407fb667ddc04e1a8f2e203bb7b9c80e1
    4236 Internet Packet Disturber
    4237 net_* and hook_* man pages are wrong
commit 54a20ab41aadcb81c53e72fc65886e964e9add59
    4248 dtrace(1M) should never create DOF with empty probes section
    4249 Only probes from the first DTrace object file will be included

Conflicts:
	usr/src/uts/intel/ipd/Makefile
	usr/src/uts/common/vm/as.h
	usr/src/uts/common/sys/ipd.h
	usr/src/uts/common/inet/ipd/ipd.conf
	usr/src/uts/common/inet/ipd/ipd.c
	usr/src/uts/common/fs/tmpfs/tmp_vnops.c
	usr/src/man/man1m/Makefile
	usr/src/lib/libipd/common/mapfile-vers
	usr/src/lib/libdtrace/common/dt_impl.h
	usr/src/lib/libdtrace/common/dt_error.c
	usr/src/cmd/tail/extern.h
	usr/src/cmd/ipdadm/ipdadm.c
	usr/src/cmd/ipdadm/Makefile
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh
	usr/src/cmd/Makefile