Merge commit 'dea58231324dba08972c488dcdedbab5c528ac8a'
commitf76c58069a6be18b1fe0d693163658765acc57f2
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sat, 20 Jan 2018 17:33:43 +0000 (20 12:33 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sat, 20 Jan 2018 19:45:00 +0000 (20 14:45 -0500)
tree2bf5b053b9e8608f87adee0e6baa0d15402f9ac4
parent8a9519b2f7ed0e250e35dac80b6168f03ef310c6
parentdea58231324dba08972c488dcdedbab5c528ac8a
Merge commit 'dea58231324dba08972c488dcdedbab5c528ac8a'
34 files changed:
kernel/fs/zfs/sys/zfs_ioctl.h
kernel/fs/zfs/sys/zil.h
kernel/fs/zfs/sys/zil_impl.h
kernel/fs/zfs/sys/zio.h
kernel/fs/zfs/vdev.c
kernel/fs/zfs/zfs_log.c
kernel/fs/zfs/zil.c
kernel/fs/zfs/zio.c
kernel/fs/zfs/zvol.c
share/man/man3nsl/rpc_svc_create.3nsl
share/man/man4/Makefile
share/man/man4/loader.conf.4
share/man/man5/Makefile
share/man/man5/beastie.4th.5
share/man/man5/brand.4th.5
share/man/man5/check-password.4th.5
share/man/man5/color.4th.5
share/man/man5/delay.4th.5
share/man/man5/gptzfsboot.5
share/man/man5/loader.4th.5
share/man/man5/loader.5
share/man/man5/menu.4th.5
share/man/man5/menusets.4th.5
share/man/man5/pxeboot.5
share/man/man5/version.4th.5
share/man/man5/zfsloader.5
usr/src/cmd/cmd-inet/usr.lib/in.ndpd/main.c
usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c
usr/src/cmd/ztest/ztest.c
usr/src/pkg/manifests/developer-build-onbld.mf
usr/src/pkg/manifests/system-boot-loader.mf
usr/src/pkg/manifests/system-kernel.mf
usr/src/tools/btxld/Makefile
usr/src/uts/common/rpc/rpcib.c