Merge commit '9276b3991ba20d5a5660887ba81b0bc7bed25a0c'
commit620cb45e90334509a82fe5a805b81575cfeb5b91
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 17 Jul 2018 03:29:01 +0000 (16 23:29 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 17 Jul 2018 03:58:39 +0000 (16 23:58 -0400)
tree417b715c4863a1ca6a3ee1d8c278036eea871e49
parent22a73de74ac22f9cc0b3b24ec2392f16a859d766
parent9276b3991ba20d5a5660887ba81b0bc7bed25a0c
Merge commit '9276b3991ba20d5a5660887ba81b0bc7bed25a0c'
29 files changed:
arch/x86/include/sys/acpi/platform/acsolaris.h
arch/x86/include/sys/bootinfo.h
arch/x86/kernel/platform/i86pc/dboot/dboot_startkern.c
arch/x86/kernel/platform/i86pc/os/ddi_impl.c
arch/x86/kernel/platform/i86pc/os/fakebop.c
arch/x86/kernel/platform/i86pc/os/startup.c
arch/x86/kernel/platform/i86pc/os/trap.c
include/sys/efi.h
include/sys/model.h
include/sys/scsi/adapters/mpt_sas/mptsas_var.h
kernel/net/ip/ip6_ire.c
share/man/man8/acpidump.8
share/man/man8/acpixtract.8
share/man/man9f/mac_register.9f
usr/src/boot/sys/boot/efi/loader/Makefile
usr/src/boot/sys/boot/i386/libi386/Makefile
usr/src/boot/sys/cddl/boot/zfs/zfsimpl.h
usr/src/cmd/mdb/common/modules/dtrace/dtrace.c
usr/src/cmd/mdb/common/modules/genunix/genunix.c
usr/src/cmd/mdb/common/modules/mdb_ks/mdb_ks.c
usr/src/cmd/mdb/common/modules/ptm/ptm.c
usr/src/cmd/tail/tests/sun_solaris_tail.sh
usr/src/cmd/tail/tests/tailtests.sh
usr/src/lib/libdiskmgt/common/drive.c
usr/src/pkg/manifests/driver-storage-mpt_sas.mf
usr/src/pkg/manifests/system-boot-loader.mf
usr/src/uts/common/io/dld/dld_proto.c
usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas_impl.c
usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas_init.c