Merge illumos-gate
commit11a37ce24d855e9738b4792181f2bd9e71f237a6
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sun, 3 Mar 2019 15:30:36 +0000 (3 10:30 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sun, 3 Mar 2019 15:30:36 +0000 (3 10:30 -0500)
treee2c8d98f0eb1dd50c031f3c7357e6cc21473cb8d
parent88d5686471f19adfe6d6ce827c8b7c5ac30b2823
parent863275a46b877530dd1c728df0b4e9bddb5702e3
Merge illumos-gate
kernel/fs/zfs/zfs_ioctl.c
usr/src/boot/sys/boot/i386/libi386/Makefile
usr/src/lib/libzfs/common/libzfs_dataset.c
usr/src/lib/libzfs/common/libzfs_sendrecv.c
usr/src/lib/libzfs_core/common/libzfs_core.c