Merge commit 'd6e1c446d7897003fd9fd36ef5aa7da350b7f6af' into merges
commit9def578ac37bfad9638b3507edad05d7fa57f559
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 20 Jul 2018 21:02:38 +0000 (20 17:02 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 20 Jul 2018 21:02:38 +0000 (20 17:02 -0400)
tree622c48642444555f7e4a6f5c979f4b910a9657ab
parent297cb10f3ea1b4e1366e54cb1a9657eb25c756d7
parentd6e1c446d7897003fd9fd36ef5aa7da350b7f6af
Merge commit 'd6e1c446d7897003fd9fd36ef5aa7da350b7f6af' into merges
34 files changed:
include/sys/fs/zfs.h
include/sys/vfs.h
kernel/fs/hsfs/hsfs_vfsops.c
kernel/fs/pcfs/pc_vfsops.c
kernel/fs/udfs/udf_vfsops.c
kernel/fs/ufs/ufs_vfsops.c
kernel/fs/vfs.c
kernel/fs/zfs/Makefile
kernel/fs/zfs/spa.c
kernel/fs/zfs/spa_config.c
kernel/fs/zfs/spa_misc.c
kernel/fs/zfs/sys/spa.h
kernel/fs/zfs/sys/spa_impl.h
kernel/fs/zfs/sys/vdev.h
kernel/fs/zfs/sys/vdev_impl.h
kernel/fs/zfs/sys/vdev_removal.h
kernel/fs/zfs/sys/zio.h
kernel/fs/zfs/sys/zthr.h
kernel/fs/zfs/vdev.c
kernel/fs/zfs/vdev_indirect.c
kernel/fs/zfs/vdev_label.c
kernel/fs/zfs/vdev_mirror.c
kernel/fs/zfs/vdev_root.c
kernel/fs/zfs/zio.c
kernel/fs/zfs/zthr.c
usr/src/cmd/mdb/common/modules/zfs/zfs.c
usr/src/lib/libzfs/common/libzfs.h
usr/src/lib/libzfs/common/libzfs_pool.c
usr/src/lib/libzfs/common/libzfs_sendrecv.c
usr/src/lib/libzpool/common/kernel.c
usr/src/lib/libzpool/common/sys/zfs_context.h
usr/src/pkg/manifests/system-test-zfstest.mf
usr/src/test/zfs-tests/tests/functional/rsend/rsend.kshlib
usr/src/uts/common/Makefile.files