Merge commit '243952c7eeef020886e3e2e3df99a513df40584a'
commit23d0dda91c1702f3633c9c2521490903ea54e72b
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sun, 19 Aug 2018 14:38:06 +0000 (19 10:38 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sun, 19 Aug 2018 15:00:09 +0000 (19 11:00 -0400)
tree1c7f20e1f569db55082d24ff68d5c157b04ac4ee
parentde16a086efae01f0849c992b1e9bd3fb42750e3c
parent243952c7eeef020886e3e2e3df99a513df40584a
Merge commit '243952c7eeef020886e3e2e3df99a513df40584a'
26 files changed:
include/sys/fs/zfs.h
kernel/fs/zfs/arc.c
kernel/fs/zfs/common/zfs_comutil.c
kernel/fs/zfs/common/zfs_comutil.h
kernel/fs/zfs/dbuf.c
kernel/fs/zfs/metaslab.c
kernel/fs/zfs/spa.c
kernel/fs/zfs/vdev.c
share/man/man8/rtc.8
usr/src/cmd/mdb/common/modules/zfs/zfs.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/smbsrv/Makefile
usr/src/uts/Makefile.targ
usr/src/uts/Makefile.uts
usr/src/uts/common/fs/smbclnt/smbfs/smbfs.h
usr/src/uts/common/fs/smbclnt/smbfs/smbfs_client.c
usr/src/uts/common/fs/smbclnt/smbfs/smbfs_node.h
usr/src/uts/common/fs/smbclnt/smbfs/smbfs_subr.h
usr/src/uts/common/fs/smbclnt/smbfs/smbfs_subr2.c
usr/src/uts/common/fs/smbclnt/smbfs/smbfs_vfsops.c
usr/src/uts/common/fs/smbclnt/smbfs/smbfs_vnops.c
usr/src/uts/common/io/nvme/nvme.c
usr/src/uts/intel/nsmb/Makefile