Merge commit '720b16875295d57e0e6a4e0ec32db4d47412f896'
commitc00f2149d84e4d35766908f671dce6d6aedb66b7
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 17 Jul 2018 17:41:22 +0000 (17 13:41 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 17 Jul 2018 17:41:22 +0000 (17 13:41 -0400)
tree1b01035e540f42866556dd8d79a941f9fed87630
parent81879898782649cb95788d25eeedea3ce1dc10b9
parent720b16875295d57e0e6a4e0ec32db4d47412f896
Merge commit '720b16875295d57e0e6a4e0ec32db4d47412f896'
26 files changed:
include/sys/fm/io/disk.h
include/sys/fm/io/scsi.h
kernel/comstar/port/iscsit/iscsit.c
kernel/comstar/port/iscsit/iscsit.h
kernel/drivers/net/myri10ge/myri10ge.c
kernel/drivers/net/myri10ge/myri10ge_lro.c
kernel/fs/zfs/common/zfs_namecheck.c
kernel/fs/zfs/dbuf.c
kernel/fs/zfs/dsl_pool.c
kernel/fs/zfs/sys/dbuf.h
kernel/fs/zfs/zfs_ioctl.c
share/man/man3ext/sendfile.3ext
share/man/man3ext/sendfilev.3ext
share/man/man5/pxeboot.5
usr/src/cmd/fs.d/autofs/autod_nfs.c
usr/src/cmd/fs.d/autofs/ns_files.c
usr/src/cmd/mdb/common/modules/zfs/zfs.c
usr/src/cmd/rpcsvc/rup.c
usr/src/lib/libdladm/common/linkprop.c
usr/src/lib/libshare/common/libshare_zfs.c
usr/src/pkg/manifests/system-library.mf
usr/src/pkg/manifests/system-test-utiltest.mf
usr/src/test/util-tests/runfiles/default.run
usr/src/test/util-tests/tests/dladm/Makefile
usr/src/uts/common/io/idm/idm_so.c
usr/src/uts/common/io/usbgem/usbgem.c