Merge commit '7928f4baf4ab3230557eb6289be68aa7a3003f38'
commit1121c08b05d2c47b752936048701858c8c2abe72
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 1 Oct 2018 13:54:36 +0000 (1 09:54 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 1 Oct 2018 13:54:36 +0000 (1 09:54 -0400)
treefce657093a32f10199e113b43bcf8abd8d63ae1f
parent065ee4397b3b21c75280508a6ab5756652b8f9e5
parent7928f4baf4ab3230557eb6289be68aa7a3003f38
Merge commit '7928f4baf4ab3230557eb6289be68aa7a3003f38'
36 files changed:
arch/x86/include/sys/x86_archext.h
arch/x86/kernel/platform/i86pc/os/cpuid.c
arch/x86/kernel/platform/i86pc/os/fakebop.c
arch/x86/kernel/platform/i86pc/os/microcode.c
arch/x86/kernel/platform/i86pc/os/mlsetup.c
arch/x86/kernel/platform/i86pc/os/mp_startup.c
exception_lists/cstyle
include/sys/dtrace.h
include/sys/dtrace_impl.h
include/sys/feature_tests.h
kernel/disp/cpupart.c
kernel/drivers/net/i40e/core/i40e_adminq_cmd.h
kernel/drivers/net/i40e/core/i40e_common.c
kernel/drivers/net/i40e/core/i40e_prototype.h
kernel/drivers/net/i40e/i40e_gld.c
kernel/fs/nfs/nfs_dlinet.c
kernel/fs/zfs/dsl_dataset.c
kernel/fs/zfs/dsl_pool.c
kernel/fs/zfs/sys/dsl_pool.h
kernel/fs/zfs/txg.c
kernel/fs/zfs/zcp_get.c
kernel/fs/zfs/zio.c
share/man/man3ext/sha2.3ext
share/man/man8/hal-get-property.8
usr/src/cmd/dlutil/Makefile
usr/src/cmd/dtrace/test/tst/i386/Makefile
usr/src/lib/fm/topo/modules/common/disk/Makefile
usr/src/lib/fm/topo/modules/common/ses/ses.c
usr/src/lib/libdtrace/common/dt_cg.c
usr/src/lib/libdtrace/common/dt_open.c
usr/src/lib/libzfs/common/libzfs_dataset.c
usr/src/pkg/manifests/system-dtrace-tests.mf
usr/src/pkg/manifests/system-network.mf
usr/src/test/zfs-tests/include/libtest.shlib
usr/src/uts/common/dtrace/dtrace.c
usr/src/uts/intel/dtrace/dtrace_isa.c