Merge commit '8671400134a11c848244896ca51a7db4d0f69da4'
commitde16a086efae01f0849c992b1e9bd3fb42750e3c
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sat, 18 Aug 2018 17:01:00 +0000 (18 13:01 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sun, 19 Aug 2018 13:53:39 +0000 (19 09:53 -0400)
treeb6e1b604ab3916367aec7580aafc051d9d4e63e3
parentb9f1ebc20caa43a24912fdcb592896b006524368
parent8671400134a11c848244896ca51a7db4d0f69da4
Merge commit '8671400134a11c848244896ca51a7db4d0f69da4'
64 files changed:
include/sys/fs/zfs.h
kernel/fs/zfs/Makefile
kernel/fs/zfs/common/zfeature_common.c
kernel/fs/zfs/common/zfeature_common.h
kernel/fs/zfs/common/zpool_prop.c
kernel/fs/zfs/dmu_traverse.c
kernel/fs/zfs/dnode.c
kernel/fs/zfs/dnode_sync.c
kernel/fs/zfs/dsl_dataset.c
kernel/fs/zfs/dsl_destroy.c
kernel/fs/zfs/dsl_dir.c
kernel/fs/zfs/dsl_pool.c
kernel/fs/zfs/dsl_scan.c
kernel/fs/zfs/dsl_synctask.c
kernel/fs/zfs/dsl_userhold.c
kernel/fs/zfs/metaslab.c
kernel/fs/zfs/range_tree.c
kernel/fs/zfs/spa.c
kernel/fs/zfs/spa_checkpoint.c
kernel/fs/zfs/spa_misc.c
kernel/fs/zfs/space_map.c
kernel/fs/zfs/sys/dmu.h
kernel/fs/zfs/sys/dsl_dir.h
kernel/fs/zfs/sys/dsl_pool.h
kernel/fs/zfs/sys/dsl_synctask.h
kernel/fs/zfs/sys/metaslab.h
kernel/fs/zfs/sys/metaslab_impl.h
kernel/fs/zfs/sys/range_tree.h
kernel/fs/zfs/sys/spa.h
kernel/fs/zfs/sys/spa_checkpoint.h
kernel/fs/zfs/sys/spa_impl.h
kernel/fs/zfs/sys/space_map.h
kernel/fs/zfs/sys/uberblock_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/uberblock.c
kernel/fs/zfs/vdev.c
kernel/fs/zfs/vdev_indirect.c
kernel/fs/zfs/vdev_label.c
kernel/fs/zfs/vdev_removal.c
kernel/fs/zfs/zcp.c
kernel/fs/zfs/zcp_synctask.c
kernel/fs/zfs/zfs_ioctl.c
kernel/fs/zfs/zil.c
kernel/fs/zfs/zio.c
kernel/fs/zfs/zthr.c
share/man/man5/zpool-features.5
share/man/man8/zdb.8
share/man/man8/zpool.8
usr/src/cmd/mdb/common/modules/zfs/zfs.c
usr/src/cmd/truss/codes.c
usr/src/cmd/zdb/zdb.c
usr/src/cmd/ztest/ztest.c
usr/src/lib/libzfs/common/libzfs.h
usr/src/lib/libzfs/common/libzfs_pool.c
usr/src/lib/libzfs/common/libzfs_util.c
usr/src/lib/libzfs_core/common/libzfs_core.c
usr/src/lib/libzpool/common/sys/zfs_context.h
usr/src/pkg/manifests/system-test-zfstest.mf
usr/src/test/zfs-tests/include/libtest.shlib
usr/src/uts/common/Makefile.files