Merge commit '7e3488dc6cdcb0c04e1ce167a1a3bfef83b5f2e0'
commit003a435a5555068ac162c4fe6eab8d59c034bde8
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Thu, 23 Aug 2018 13:30:33 +0000 (23 09:30 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Thu, 23 Aug 2018 13:30:33 +0000 (23 09:30 -0400)
treea44c034cd65e69e6b81e5f05668ff5158e7d12be
parent166050493e8b4650c53fe9d58b87b5a065313c7f
parent7e3488dc6cdcb0c04e1ce167a1a3bfef83b5f2e0
Merge commit '7e3488dc6cdcb0c04e1ce167a1a3bfef83b5f2e0'
17 files changed:
arch/x86/kernel/ml/modstubs.s
include/sys/fs/zfs.h
include/sys/nvpair.h
include/sys/nvpair_impl.h
kernel/fs/zfs/arc.c
kernel/fs/zfs/common/zfs_prop.c
kernel/fs/zfs/dsl_dir.c
kernel/fs/zfs/spa_misc.c
kernel/fs/zfs/sys/arc.h
kernel/fs/zfs/sys/spa.h
kernel/fs/zfs/sys/spa_impl.h
kernel/fs/zfs/sys/zfs_ioctl.h
share/man/man3ext/sendfile.3ext
share/man/man8/zfs.8
usr/src/lib/libzfs/common/libzfs_dataset.c
usr/src/pkg/manifests/system-dtrace-tests.mf
usr/src/uts/common/io/qede/qede_fp.c