Merge commit '78149ac661d1ba94da655d9464c92bdd323b0ffc'
commit828bb26b053cce086ef428f4ecf20aa801e68128
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 1 Oct 2018 14:52:06 +0000 (1 10:52 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 1 Oct 2018 14:52:06 +0000 (1 10:52 -0400)
tree71039cff1a072d55dbc6f78864615c4d561bdcd2
parent1121c08b05d2c47b752936048701858c8c2abe72
parent78149ac661d1ba94da655d9464c92bdd323b0ffc
Merge commit '78149ac661d1ba94da655d9464c92bdd323b0ffc'
arch/x86/kernel/platform/i86pc/include/sys/apic.h
arch/x86/kernel/platform/i86pc/include/sys/apic_common.h
arch/x86/kernel/platform/i86pc/include/sys/psm_types.h
arch/x86/kernel/platform/i86pc/include/sys/smp_impldefs.h
arch/x86/kernel/platform/i86pc/os/mp_machdep.c
kernel/fs/zfs/dsl_dataset.c
usr/src/lib/fm/topo/modules/common/disk/disk_common.c
usr/src/uts/i86pc/io/apix/apix.c
usr/src/uts/i86pc/io/pcplusmp/apic.c
usr/src/uts/i86pc/io/pcplusmp/apic_common.c