Merge commit 'f52b16c60da4b4c350471d7fc68089d796cc082f' into merges
commit970d738f0bf7a797a4301444079e56bdf7765f83
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 13 Jul 2018 01:13:11 +0000 (12 21:13 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 13 Jul 2018 01:13:11 +0000 (12 21:13 -0400)
treecc97ae449dce343f3fd27a298da3870342d98ede
parent162869872a5a78dc79570b7c4744f6093d0634cc
parentf52b16c60da4b4c350471d7fc68089d796cc082f
Merge commit 'f52b16c60da4b4c350471d7fc68089d796cc082f' into merges
22 files changed:
include/fnmatch.h
include/sys/fs/zfs.h
kernel/fs/zfs/bpobj.c
kernel/fs/zfs/dsl_scan.c
kernel/fs/zfs/spa.c
kernel/fs/zfs/spa_misc.c
kernel/fs/zfs/sys/dsl_scan.h
kernel/fs/zfs/sys/spa.h
kernel/fs/zfs/sys/spa_impl.h
kernel/fs/zfs/zfs_ioctl.c
share/man/man3c/fnmatch.3c
share/man/man8/zpool.8
usr/src/lib/libdisasm/Makefile.targ
usr/src/lib/libsaveargs/Makefile.targ
usr/src/lib/libumem/Makefile.targ
usr/src/lib/libzfs/common/libzfs.h
usr/src/lib/libzfs/common/libzfs_pool.c
usr/src/lib/libzfs/common/libzfs_util.c
usr/src/pkg/manifests/system-test-libctest.mf
usr/src/test/libc-tests/tests/Makefile
usr/src/test/zfs-tests/include/libtest.shlib
usr/src/tools/Makefile