Merge commit '6b8702c2d714a793b56a83a26988208caccea8d8'
commit7265d1ea36293824ecb460dd2308462488826660
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 21 Aug 2018 00:43:21 +0000 (20 20:43 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 21 Aug 2018 00:45:30 +0000 (20 20:45 -0400)
treec845211e1b3d1ed588d5e1e057888ad2aacbcf4c
parentb5afd368050252ee594cd6c306867e196ceadd9b
parent6b8702c2d714a793b56a83a26988208caccea8d8
Merge commit '6b8702c2d714a793b56a83a26988208caccea8d8'
53 files changed:
kernel/drivers/scsi/cpqary3/cpqary3_transport.c
kernel/drivers/scsi/mega_sas/megaraid_sas.c
kernel/fs/zfs/dbuf.c
kernel/fs/zfs/dmu.c
kernel/fs/zfs/dmu_objset.c
kernel/fs/zfs/dmu_send.c
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/dbuf.h
kernel/fs/zfs/sys/dmu.h
kernel/fs/zfs/sys/dmu_objset.h
kernel/fs/zfs/sys/spa.h
kernel/fs/zfs/sys/spa_impl.h
kernel/fs/zfs/sys/vdev_removal.h
kernel/fs/zfs/sys/zfs_debug.h
kernel/fs/zfs/sys/zio.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_removal.c
kernel/fs/zfs/zfs_vfsops.c
kernel/fs/zfs/zio.c
kernel/net/ipnet/ipnet.c
kernel/net/iptun/iptun.c
usr/src/cmd/acct/acctcon.c
usr/src/cmd/acct/acctcon1.c
usr/src/cmd/backup/restore/dirs.c
usr/src/cmd/backup/restore/main.c
usr/src/cmd/backup/restore/symtab.c
usr/src/cmd/cpio/cpio.c
usr/src/cmd/cron/at_cmd.c
usr/src/cmd/devfsadm/devalloc.c
usr/src/cmd/devfsadm/devfsadm.c
usr/src/cmd/ed/ed.c
usr/src/cmd/idmap/idmap/idmap.c
usr/src/cmd/krb5/kadmin/server/ipropd_svc.c
usr/src/cmd/listen/listen.c
usr/src/cmd/login/login.c
usr/src/cmd/mailx/cmd3.c
usr/src/cmd/nl/nl.c
usr/src/cmd/vscan/vscand/vs_eng.c
usr/src/cmd/zdb/zdb.c
usr/src/cmd/ztest/ztest.c
usr/src/lib/libzfs/common/libzfs_pool.c
usr/src/tools/Makefile.tools
usr/src/uts/common/crypto/io/dprov.c
usr/src/uts/common/io/1394/targets/scsa1394/hba.c
usr/src/uts/common/io/fibre-channel/impl/fctl.c
usr/src/uts/common/io/gld.c
usr/src/uts/common/io/ib/adapters/hermon/hermon.c