[illumos-gate merge]

commit d0b89bad7e1fdc02b67434ccc5d1c0e983e25583
    12743 man page spelling mistakes
commit 7e95e8d94bf4ccccc742a5e7a1370afe0d890ae3
    12728 emlxs: symbol 'emlxs_prog_type_t' is multiply-defined
commit bd025ac2b6fbfbc59dfc0bd50a0e56dd56de9229
    12739 gld module missing dep on mac after 12671
commit 4c87aefe8930bd07275b8dd2e96ea5f24d93a52e
    12665 want modern bhyve
commit a68aefedafdc78f1f25e9c888f61357d59c87311
    12540 mdb: build with gcore

	Conflicts:
	exception_lists/check_rtime
	exception_lists/copyright
	exception_lists/cstyle
	exception_lists/hdrchk
	exception_lists/packaging
	exception_lists/wscheck
	usr/src/cmd/bhyve/Makefile
	usr/src/cmd/bhyve/acpi.c
	usr/src/cmd/bhyve/bhyverun.c
	usr/src/cmd/bhyve/block_if.c
	usr/src/cmd/bhyve/gdb.c
	usr/src/cmd/bhyve/mevent.c
	usr/src/cmd/bhyve/pci_e82545.c
	usr/src/cmd/bhyve/pci_emul.c
	usr/src/cmd/bhyve/pci_emul.h
	usr/src/cmd/bhyve/pci_fbuf.c
	usr/src/cmd/bhyve/pci_nvme.c
	usr/src/cmd/bhyve/pci_passthru.c
	usr/src/cmd/bhyve/pci_virtio_block.c
	usr/src/cmd/bhyve/pci_virtio_console.c
	usr/src/cmd/bhyve/pci_virtio_net.c
	usr/src/cmd/bhyve/pci_virtio_scsi.c
	usr/src/cmd/bhyve/pci_virtio_viona.c
	usr/src/cmd/bhyve/pci_xhci.c
	usr/src/cmd/bhyve/rfb.c
	usr/src/cmd/bhyve/test/Makefile.com
	usr/src/cmd/bhyve/test/tst/mevent/lists.delete.c
	usr/src/cmd/bhyve/test/tst/mevent/testlib.c
	usr/src/cmd/bhyve/test/tst/mevent/testlib.h
	usr/src/cmd/bhyve/uart_emul.c
	usr/src/cmd/bhyve/virtio.c
	usr/src/cmd/bhyve/virtio.h
	usr/src/cmd/bhyvectl/Makefile
	usr/src/cmd/bhyvectl/bhyvectl.c
	usr/src/cmd/devfsadm/i386/misc_link_i386.c
	usr/src/compat/freebsd/amd64/machine/specialreg.h
	usr/src/compat/freebsd/sys/callout.h
	usr/src/compat/freebsd/sys/param.h
	usr/src/lib/Makefile
	usr/src/lib/libvmmapi/common/mapfile-vers
	usr/src/lib/libvmmapi/common/vmmapi.c
	usr/src/lib/libvmmapi/common/vmmapi.h
	usr/src/pkg/manifests/system-bhyve.mf
	usr/src/pkg/manifests/system-library-bhyve.mf
	usr/src/uts/i86pc/Makefile.files
	usr/src/uts/i86pc/io/vmm/README.sync
	usr/src/uts/i86pc/io/vmm/amd/svm.c
	usr/src/uts/i86pc/io/vmm/intel/vmx.c
	usr/src/uts/i86pc/io/vmm/intel/vtd.c
	usr/src/uts/i86pc/io/vmm/io/ppt.h
	usr/src/uts/i86pc/io/vmm/io/vatpit.c
	usr/src/uts/i86pc/io/vmm/io/vlapic.c
	usr/src/uts/i86pc/io/vmm/vm/vm_map.h
	usr/src/uts/i86pc/io/vmm/vm/vm_page.h
	usr/src/uts/i86pc/io/vmm/vmm.c
	usr/src/uts/i86pc/io/vmm/vmm_host.h
	usr/src/uts/i86pc/io/vmm/vmm_instruction_emul.c
	usr/src/uts/i86pc/io/vmm/vmm_sol_dev.c
	usr/src/uts/i86pc/io/vmm/vmm_sol_glue.c
	usr/src/uts/i86pc/io/vmm/vmm_sol_vm.c
	usr/src/uts/i86pc/sys/viona_io.h
	usr/src/uts/i86pc/sys/vmm.h
	usr/src/uts/i86pc/sys/vmm_dev.h
	usr/src/uts/i86pc/sys/vmm_drv.h
	usr/src/uts/i86pc/viona/Makefile
	usr/src/uts/i86pc/vmm/Makefile

3 files changed, 84 insertions, 1 deletions

diff --git a/exception_lists/check_rtime b/exception_lists/check_rtime
index 467996f9b4..3d5e7bf491 100644
--- a/exception_lists/check_rtime
+++ b/exception_lists/check_rtime
@@ -25,6 +25,7 @@
 # Copyright 2018 Joyent, Inc.
 # Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
 # Copyright 2019 Peter Tribble.
+# Copyright 2018 Joyent, Inc.
 # Copyright 2020 Oxide Computer Company
 #
 
@@ -84,7 +85,7 @@ EXEC_STACK	^opt/os-tests/tests/secflags/stacky$
 
 # Objects for which we allow relocations to the text segment
 TEXTREL		^platform/.*/MACH(kernel)/unix$
-TEXTREL		^usr/sbin/bhyve$
+TEXTREL		^usr/sbin/amd64/bhyve$
 
 # Directories and files that are allowed to have no direct bound symbols
 NODIRECT	^platform/.*/MACH(kernel)/unix$
diff --git a/exception_lists/cstyle b/exception_lists/cstyle
index af367a074f..4da7cad3df 100644
--- a/exception_lists/cstyle
+++ b/exception_lists/cstyle
@@ -1375,6 +1375,7 @@ usr/src/cmd/bhyve/fwctl.[ch]
 usr/src/cmd/bhyve/gdb.[ch]
 usr/src/cmd/bhyve/inout.[ch]
 usr/src/cmd/bhyve/ioapic.[ch]
+usr/src/cmd/bhyve/iov.[ch]
 usr/src/cmd/bhyve/mem.[ch]
 usr/src/cmd/bhyve/mevent.[ch]
 usr/src/cmd/bhyve/mevent_test.c
diff --git a/exception_lists/wscheck b/exception_lists/wscheck
index 03f5ee691d..0a66384f9c 100644
--- a/exception_lists/wscheck
+++ b/exception_lists/wscheck
@@ -115,3 +115,84 @@ usr/src/uts/common/io/qede/*
 usr/src/uts/common/io/i40e/core/*
 usr/src/uts/common/io/ixgbe/core/*
 usr/src/test/util-tests/tests/dis/i386/*.out
+
+# bhyve sources
+usr/src/cmd/bhyve/acpi.[ch]
+usr/src/cmd/bhyve/ahci.h
+usr/src/cmd/bhyve/atkbdc.[ch]
+usr/src/cmd/bhyve/bhyvegc.[ch]
+usr/src/cmd/bhyve/bhyverun.[ch]
+usr/src/cmd/bhyve/block_if.[ch]
+usr/src/cmd/bhyve/bootrom.[ch]
+usr/src/cmd/bhyve/console.[ch]
+usr/src/cmd/bhyve/consport.c
+usr/src/cmd/bhyve/dbgport.[ch]
+usr/src/cmd/bhyve/fwctl.[ch]
+usr/src/cmd/bhyve/gdb.[ch]
+usr/src/cmd/bhyve/inout.[ch]
+usr/src/cmd/bhyve/ioapic.[ch]
+usr/src/cmd/bhyve/mem.[ch]
+usr/src/cmd/bhyve/mevent.[ch]
+usr/src/cmd/bhyve/mevent_test.c
+usr/src/cmd/bhyve/mptbl.[ch]
+usr/src/cmd/bhyve/pci_ahci.c
+usr/src/cmd/bhyve/pci_e82545.c
+usr/src/cmd/bhyve/pci_emul.[ch]
+usr/src/cmd/bhyve/pci_fbuf.c
+usr/src/cmd/bhyve/pci_hostbridge.c
+usr/src/cmd/bhyve/pci_irq.[ch]
+usr/src/cmd/bhyve/pci_lpc.[ch]
+usr/src/cmd/bhyve/pci_nvme.c
+usr/src/cmd/bhyve/pci_passthru.c
+usr/src/cmd/bhyve/pci_uart.c
+usr/src/cmd/bhyve/pci_virtio_block.c
+usr/src/cmd/bhyve/pci_virtio_console.c
+usr/src/cmd/bhyve/pci_virtio_net.c
+usr/src/cmd/bhyve/pci_virtio_rnd.c
+usr/src/cmd/bhyve/pci_virtio_scsi.c
+usr/src/cmd/bhyve/pci_xhci.[ch]
+usr/src/cmd/bhyve/pm.c
+usr/src/cmd/bhyve/pmtmr.c
+usr/src/cmd/bhyve/post.c
+usr/src/cmd/bhyve/ps2kbd.[ch]
+usr/src/cmd/bhyve/ps2mouse.[ch]
+usr/src/cmd/bhyve/rfb.[ch]
+usr/src/cmd/bhyve/rtc.[ch]
+usr/src/cmd/bhyve/smbiostbl.[ch]
+usr/src/cmd/bhyve/sockstream.[ch]
+usr/src/cmd/bhyve/spinup_ap.[ch]
+usr/src/cmd/bhyve/task_switch.c
+usr/src/cmd/bhyve/uart_emul.[ch]
+usr/src/cmd/bhyve/usb_emul.[ch]
+usr/src/cmd/bhyve/usb_mouse.c
+usr/src/cmd/bhyve/vga.[ch]
+usr/src/cmd/bhyve/virtio.[ch]
+usr/src/cmd/bhyve/xmsr.[ch]
+usr/src/cmd/bhyveconsole/bhyveconsole.c
+usr/src/cmd/bhyvectl/bhyvectl.c
+usr/src/compat/freebsd/*.h
+usr/src/compat/freebsd/*/*.h
+usr/src/compat/freebsd/amd64/machine/*.h
+usr/contrib/freebsd/*/*.h
+usr/contrib/freebsd/*/*/*.h
+usr/contrib/freebsd/lib/libutil/*.c
+usr/src/lib/libvmmapi/common/vmmapi.[ch]
+usr/src/uts/i86pc/io/vmm/amd/*.[ch]
+usr/src/uts/i86pc/io/vmm/intel/*.[chs]
+usr/src/uts/i86pc/io/vmm/io/*.[ch]
+usr/src/uts/i86pc/io/vmm/vmm.c
+usr/src/uts/i86pc/io/vmm/vmm_host.[ch]
+usr/src/uts/i86pc/io/vmm/vmm_instruction_emul.c
+usr/src/uts/i86pc/io/vmm/vmm_ioport.[ch]
+usr/src/uts/i86pc/io/vmm/vmm_ipi.h
+usr/src/uts/i86pc/io/vmm/vmm_ktr.h
+usr/src/uts/i86pc/io/vmm/vmm_lapic.[ch]
+usr/src/uts/i86pc/io/vmm/vmm_mem.[ch]
+usr/src/uts/i86pc/io/vmm/vmm_sol_glue.c
+usr/src/uts/i86pc/io/vmm/vmm_stat.[ch]
+usr/src/uts/i86pc/io/vmm/vmm_util.[ch]
+usr/src/uts/i86pc/io/vmm/vmx_assym.s
+usr/src/uts/i86pc/io/vmm/x86.[ch]
+usr/src/uts/i86pc/sys/vmm.h
+usr/src/uts/i86pc/sys/vmm_dev.h
+usr/src/uts/i86pc/sys/vmm_instruction_emul.h