Merge commit 'aafbdf3fa8f988ec989a8143b47d3158161d2143'
commit0b1c41dd523ab3c53aeac2792487121986ca6cf6
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 21 Aug 2018 19:07:17 +0000 (21 15:07 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 21 Aug 2018 19:07:17 +0000 (21 15:07 -0400)
treed74b7d70d833e0a9b53b6859907102c4e6268ec1
parent188bea704d842c02d5f13c01469bb74d2f1ccb13
parentaafbdf3fa8f988ec989a8143b47d3158161d2143
Merge commit 'aafbdf3fa8f988ec989a8143b47d3158161d2143'
30 files changed:
arch/x86/kernel/platform/i86pc/include/sys/apic.h
arch/x86/kernel/platform/i86pc/include/sys/apic_common.h
kernel/comstar/lu/stmf_sbd/sbd_zvol.c
kernel/comstar/lu/stmf_sbd/stmf_sbd.h
kernel/fs/zfs/common/zfs_namecheck.c
kernel/fs/zfs/common/zfs_namecheck.h
kernel/fs/zfs/dmu.c
kernel/fs/zfs/dmu_object.c
kernel/fs/zfs/dmu_objset.c
kernel/fs/zfs/dmu_send.c
kernel/fs/zfs/dmu_tx.c
kernel/fs/zfs/dsl_dir.c
kernel/fs/zfs/space_map.c
kernel/fs/zfs/sys/dmu.h
kernel/fs/zfs/sys/dmu_send.h
kernel/fs/zfs/sys/txg_impl.h
kernel/fs/zfs/txg.c
kernel/fs/zfs/zvol.c
share/man/man8/zfs.8
share/man/man8/zpool.8
usr/src/cmd/mdb/common/modules/zfs/zfs.c
usr/src/cmd/zdb/zdb.c
usr/src/lib/Makefile
usr/src/lib/libc/port/print/doprnt.c
usr/src/lib/libzfs/common/libzfs_dataset.c
usr/src/pkg/manifests/system-test-libctest.mf
usr/src/pkg/manifests/system-test-zfstest.mf
usr/src/test/libc-tests/tests/Makefile
usr/src/test/zfs-tests/include/libtest.shlib
usr/src/uts/i86pc/io/pcplusmp/apic_common.c