Merge commit 'bb1f424574ac8e08069d0ba993c2a41ffe796794'
commit134f36ceffc5b184cd74c8967f816408a8c2decb
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 21 Aug 2018 12:11:54 +0000 (21 08:11 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 21 Aug 2018 14:14:02 +0000 (21 10:14 -0400)
tree1eb0b6095ec375a0c560cf766f83d6b08586e67a
parente9f28a82fbe17136330c8125876877aed21d7e02
parentbb1f424574ac8e08069d0ba993c2a41ffe796794
Merge commit 'bb1f424574ac8e08069d0ba993c2a41ffe796794'
45 files changed:
arch/x86/kernel/platform/i86pc/boot/boot_console.c
arch/x86/kernel/platform/i86pc/os/trap.c
include/sys/fs/zfs.h
kernel/disp/cmt.c
kernel/fs/zfs/Makefile
kernel/fs/zfs/dsl_scan.c
kernel/fs/zfs/metaslab.c
kernel/fs/zfs/spa.c
kernel/fs/zfs/spa_misc.c
kernel/fs/zfs/sys/metaslab_impl.h
kernel/fs/zfs/sys/spa.h
kernel/fs/zfs/sys/vdev_impl.h
kernel/fs/zfs/sys/vdev_initialize.h
kernel/fs/zfs/sys/zio_priority.h
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_initialize.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/zfs_ioctl.c
kernel/fs/zfs/zfs_znode.c
kernel/net/ipd/ipd.c
kernel/os/lgrp.c
share/man/man8/zpool.8
usr/src/cmd/boot/bootadm/bootadm.c
usr/src/cmd/pr/pr.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_diff.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/lib/nsswitch/ldap/common/getprinter.c
usr/src/pkg/manifests/system-test-zfstest.mf
usr/src/uts/common/Makefile.files
usr/src/uts/common/io/nvme/nvme.c
usr/src/uts/common/io/sata/adapters/si3124/si3124.c