Merge commit 'dc97a43d4a70c8773a619f11b95b07a787f6f5b7' into merges
commit46bce68105f971e99e7ad863bb2b17c2199f6e65
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 13 Jul 2018 18:10:52 +0000 (13 14:10 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 13 Jul 2018 18:26:31 +0000 (13 14:26 -0400)
treeff3d308de4fc0ca2739f081dfce199b77fbebcf1
parent3d244f262b665637caf1bb1ec0bf13a82ea68f40
parentdc97a43d4a70c8773a619f11b95b07a787f6f5b7
Merge commit 'dc97a43d4a70c8773a619f11b95b07a787f6f5b7' into merges
34 files changed:
arch/x86/kernel/platform/i86pc/os/pci_bios.c
include/sys/debug.h
include/sys/scsi/targets/sddef.h
include/sys/time.h
kernel/fs/zfs/dmu.c
kernel/fs/zfs/dsl_destroy.c
kernel/fs/zfs/sys/dmu.h
kernel/fs/zfs/sys/zil.h
kernel/fs/zfs/sys/zil_impl.h
kernel/fs/zfs/sys/zio.h
kernel/fs/zfs/txg.c
kernel/fs/zfs/vdev_mirror.c
kernel/fs/zfs/zfs_vnops.c
kernel/fs/zfs/zil.c
kernel/fs/zfs/zio.c
kernel/fs/zfs/zvol.c
usr/src/cmd/beadm/Makefile
usr/src/cmd/beadm/beadm.c
usr/src/cmd/du/du.c
usr/src/cmd/fs.d/Makefile
usr/src/cmd/ls/ls.c
usr/src/cmd/sgs/libld/common/args.c
usr/src/cmd/sgs/libld/common/libld.msg
usr/src/cmd/stat/fsstat/Makefile
usr/src/cmd/swap/Makefile.com
usr/src/cmd/swap/swap.c
usr/src/cmd/zdb/Makefile.com
usr/src/cmd/zdb/zdb.c
usr/src/cmd/ztest/ztest.c
usr/src/lib/libcmdutils/Makefile.com
usr/src/lib/libzfs/Makefile.com
usr/src/lib/libzfs/common/libzfs_util.c
usr/src/lib/libzpool/common/sys/zfs_context.h
usr/src/uts/common/io/nvme/nvme.c