Merge commit '5cabbc6b49070407fb9610cfe73d4c0e0dea3e77' into merges
commit310ff9ceac5cb2aa491e72ea7b21bfca2a89aa00
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 18 Jul 2018 13:50:04 +0000 (18 09:50 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 18 Jul 2018 13:50:04 +0000 (18 09:50 -0400)
treeb571808ccbe83a848145ac486f4982261f9c6306
parentd5632bc8106427de687446c372637c38973d7820
parent5cabbc6b49070407fb9610cfe73d4c0e0dea3e77
Merge commit '5cabbc6b49070407fb9610cfe73d4c0e0dea3e77' into merges
89 files changed:
include/sys/fs/zfs.h
kernel/fs/zfs/Makefile
kernel/fs/zfs/arc.c
kernel/fs/zfs/bpobj.c
kernel/fs/zfs/common/zfeature_common.c
kernel/fs/zfs/common/zfeature_common.h
kernel/fs/zfs/common/zfs_deleg.c
kernel/fs/zfs/common/zfs_deleg.h
kernel/fs/zfs/common/zfs_prop.c
kernel/fs/zfs/dbuf.c
kernel/fs/zfs/ddt.c
kernel/fs/zfs/dmu.c
kernel/fs/zfs/dmu_objset.c
kernel/fs/zfs/dmu_tx.c
kernel/fs/zfs/dmu_zfetch.c
kernel/fs/zfs/dnode.c
kernel/fs/zfs/dsl_dataset.c
kernel/fs/zfs/dsl_deadlist.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/metaslab.c
kernel/fs/zfs/range_tree.c
kernel/fs/zfs/spa.c
kernel/fs/zfs/spa_config.c
kernel/fs/zfs/spa_misc.c
kernel/fs/zfs/space_map.c
kernel/fs/zfs/space_reftree.c
kernel/fs/zfs/sys/bpobj.h
kernel/fs/zfs/sys/dbuf.h
kernel/fs/zfs/sys/dmu.h
kernel/fs/zfs/sys/dnode.h
kernel/fs/zfs/sys/dsl_dataset.h
kernel/fs/zfs/sys/dsl_deadlist.h
kernel/fs/zfs/sys/dsl_deleg.h
kernel/fs/zfs/sys/dsl_dir.h
kernel/fs/zfs/sys/dsl_pool.h
kernel/fs/zfs/sys/dsl_scan.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_impl.h
kernel/fs/zfs/sys/space_map.h
kernel/fs/zfs/sys/vdev.h
kernel/fs/zfs/sys/vdev_impl.h
kernel/fs/zfs/sys/vdev_indirect_births.h
kernel/fs/zfs/sys/vdev_indirect_mapping.h
kernel/fs/zfs/sys/vdev_removal.h
kernel/fs/zfs/sys/zfs_debug.h
kernel/fs/zfs/sys/zil.h
kernel/fs/zfs/sys/zio.h
kernel/fs/zfs/sys/zio_priority.h
kernel/fs/zfs/txg.c
kernel/fs/zfs/vdev.c
kernel/fs/zfs/vdev_disk.c
kernel/fs/zfs/vdev_file.c
kernel/fs/zfs/vdev_indirect.c
kernel/fs/zfs/vdev_indirect_births.c
kernel/fs/zfs/vdev_indirect_mapping.c
kernel/fs/zfs/vdev_label.c
kernel/fs/zfs/vdev_mirror.c
kernel/fs/zfs/vdev_missing.c
kernel/fs/zfs/vdev_queue.c
kernel/fs/zfs/vdev_raidz.c
kernel/fs/zfs/vdev_removal.c
kernel/fs/zfs/vdev_root.c
kernel/fs/zfs/zcp_get.c
kernel/fs/zfs/zfs_ioctl.c
kernel/fs/zfs/zfs_vnops.c
kernel/fs/zfs/zil.c
kernel/fs/zfs/zio.c
share/man/man5/zpool-features.5
share/man/man8/zfs.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/zfs/zfs_main.c
usr/src/cmd/ztest/ztest.c
usr/src/lib/libzfs/common/libzfs.h
usr/src/lib/libzfs/common/libzfs_dataset.c
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/pkg/manifests/system-test-zfstest.mf
usr/src/test/zfs-tests/include/libtest.shlib
usr/src/uts/common/Makefile.files