Merge commit '49169a56b4da7a6f2d206ecc2166fbe2457343b9'
commit6e40c76db9fe38f093dc5e4c95c0a84b25a517e9
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Thu, 23 Aug 2018 01:10:38 +0000 (22 21:10 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Thu, 23 Aug 2018 01:10:38 +0000 (22 21:10 -0400)
tree9ce777b8373cd35f2420c7f0beb60d3d18f37c81
parentc4457237d1d1e651c7917854c162d92587fa7fd8
parent49169a56b4da7a6f2d206ecc2166fbe2457343b9
Merge commit '49169a56b4da7a6f2d206ecc2166fbe2457343b9'
23 files changed:
arch/x86/include/sys/fp.h
arch/x86/kernel/os/fpu.c
exception_lists/check_rtime
kernel/fs/nfs/nfs3_vfsops.c
kernel/fs/nfs/nfs4_client.c
kernel/fs/nfs/nfs4_rnode.c
kernel/fs/nfs/nfs4_vfsops.c
kernel/fs/nfs/nfs_client.c
kernel/fs/nfs/nfs_subr.c
kernel/fs/nfs/nfs_vfsops.c
kernel/fs/zfs/dbuf.c
kernel/fs/zfs/dnode.c
kernel/fs/zfs/dnode_sync.c
kernel/fs/zfs/spa_config.c
kernel/fs/zfs/sys/dbuf.h
kernel/fs/zfs/sys/dnode.h
kernel/fs/zfs/vdev.c
usr/src/cmd/mdb/common/modules/dtrace/dtrace.c
usr/src/pkg/manifests/system-test-zfstest.mf
usr/src/uts/common/nfs/nfs4_clnt.h
usr/src/uts/common/nfs/nfs_clnt.h
usr/src/uts/common/nfs/rnode.h
usr/src/uts/common/nfs/rnode4.h