7 files changed, 161 insertions, 0 deletions
diff --git a/exception_lists/check_rtime b/exception_lists/check_rtime
index eb69ff4335..2d8fa710e8 100644
--- a/exception_lists/check_rtime
+++ b/exception_lists/check_rtime
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
+# Copyright 2018 Joyent, Inc.
 # Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
 # Copyright 2019 Peter Tribble.
 # Copyright 2018 Joyent, Inc.
diff --git a/exception_lists/copyright b/exception_lists/copyright
index 2688984285..23ed313491 100644
--- a/exception_lists/copyright
+++ b/exception_lists/copyright
@@ -33,6 +33,30 @@ exception_lists/closed-bins
 exception_lists/copyright
 exception_lists/cstyle
 exception_lists/hdrchk
+usr/src/cmd/acpi/acpidump/acpidump.h
+usr/src/cmd/acpi/acpidump/apdump.c
+usr/src/cmd/acpi/acpidump/apfiles.c
+usr/src/cmd/acpi/acpidump/apmain.c
+usr/src/cmd/acpi/acpidump/osillumostbl.c
+usr/src/cmd/acpi/acpidump/osunixdir.c
+usr/src/cmd/acpi/acpidump/tbprint.c
+usr/src/cmd/acpi/acpidump/tbxfroot.c
+usr/src/cmd/acpi/acpidump/utbuffer.c
+usr/src/cmd/acpi/acpixtract/acpixtract.c
+usr/src/cmd/acpi/acpixtract/acpixtract.h
+usr/src/cmd/acpi/acpixtract/axmain.c
+usr/src/cmd/acpi/acpixtract/axmain.h
+usr/src/cmd/acpi/acpixtract/axutils.c
+usr/src/cmd/acpi/acpixtract/axutils.h
+usr/src/cmd/acpi/common/getopt.c
+usr/src/cmd/acpi/common/utascii.c
+usr/src/cmd/acpi/common/utdebug.c
+usr/src/cmd/acpi/common/utexcep.c
+usr/src/cmd/acpi/common/utglobal.c
+usr/src/cmd/acpi/common/utmath.c
+usr/src/cmd/acpi/common/utnonansi.c
+usr/src/cmd/acpi/common/utprint.c
+usr/src/cmd/acpi/common/utxferror.c
 usr/src/boot/*
 usr/src/cmd/acpi/acpidump/acpidump.h
 usr/src/cmd/acpi/acpidump/apdump.c
@@ -391,6 +415,7 @@ usr/src/test/crypto-tests/tests/digest/data/README
 usr/src/test/libc-tests/tests/err/data/*
 usr/src/test/libmlrpc-tests/tests/netrlogon/krb5_pac_tests/krb5_pac.bin
 usr/src/test/util-tests/tests/dis/*/*.out
+usr/src/test/util-tests/tests/libsff/*.out
 usr/src/test/util-tests/tests/grep_xpg4/files/gout*
 usr/src/test/util-tests/tests/grep_xpg4/files/test*
 usr/src/test/util-tests/tests/head/*.in
diff --git a/exception_lists/cstyle b/exception_lists/cstyle
index 814d5534cc..f0f641904b 100644
--- a/exception_lists/cstyle
+++ b/exception_lists/cstyle
@@ -647,6 +647,7 @@ usr/src/lib/krb5/ss/std_rqs.c
 usr/src/lib/krb5/ss/utils.c
 usr/src/lib/libgss/g_glue.c
 usr/src/lib/libresolv2/common
+usr/src/lib/libresolv2_joy/common
 usr/src/lib/librstp/common/base.h
 usr/src/lib/librstp/common/choose.h
 usr/src/lib/librstp/common/edge.c
@@ -814,6 +815,7 @@ usr/src/uts/common/gssapi/mechs/krb5/mech/util_validate.c
 usr/src/uts/common/gssapi/mechs/krb5/mech/val_cred.c
 usr/src/uts/common/gssapi/mechs/krb5/mech/verify.c
 usr/src/uts/common/gssapi/mechs/krb5/mech/wrap_size_limit.c
+usr/src/uts/common/inet/ipf/ip_fil_solaris.c
 usr/src/uts/common/inet/cc.h
 usr/src/uts/common/inet/cc/cc_cubic.c
 usr/src/uts/common/inet/cc/cc_module.h
@@ -1073,6 +1075,26 @@ usr/src/uts/common/io/ixgbe/core/ixgbe_x540.c
 usr/src/uts/common/io/ixgbe/core/ixgbe_x540.h
 usr/src/uts/common/io/ixgbe/core/ixgbe_x550.c
 usr/src/uts/common/io/ixgbe/core/ixgbe_x550.h
+usr/src/uts/common/io/nfp/
+usr/src/uts/common/io/nfp/osif.c
+usr/src/uts/common/io/nfp/nfp.h
+usr/src/uts/common/io/nfp/drvlist.c
+usr/src/uts/common/io/nfp/nfp_ifvers.c
+usr/src/uts/common/io/nfp/i21285.c
+usr/src/uts/common/io/nfp/nfpci.h
+usr/src/uts/common/io/nfp/nfp_error.h
+usr/src/uts/common/io/nfp/i21555.h
+usr/src/uts/common/io/nfp/i21555d.c
+usr/src/uts/common/io/nfp/hostif.c
+usr/src/uts/common/io/nfp/nfp_common.h
+usr/src/uts/common/io/nfp/nfp_osif.h
+usr/src/uts/common/io/nfp/nfdev-solaris.h
+usr/src/uts/common/io/nfp/i21555.c
+usr/src/uts/common/io/nfp/nfp_cmd.h
+usr/src/uts/common/io/nfp/nfp_hostif.h
+usr/src/uts/common/io/nfp/nfdev-common.h
+usr/src/uts/common/io/nfp/autoversion.h
+usr/src/uts/common/io/nfp/i21285.h
 usr/src/uts/common/io/qede/*
 usr/src/uts/common/io/sfxge/common/ef10_ev.c
 usr/src/uts/common/io/sfxge/common/ef10_filter.c
@@ -1269,6 +1291,16 @@ usr/src/common/acpica/utilities/utstate.c
 usr/src/common/acpica/utilities/uttrack.c
 usr/src/common/acpica/utilities/utxface.c
 usr/src/common/acpica/utilities/utxferror.c
+usr/src/uts/intel/io/vmxnet/buildNumber.h
+usr/src/uts/intel/io/vmxnet/includeCheck.h
+usr/src/uts/intel/io/vmxnet/net.h
+usr/src/uts/intel/io/vmxnet/net_sg.h
+usr/src/uts/intel/io/vmxnet/vm_basic_types.h
+usr/src/uts/intel/io/vmxnet/vm_device_version.h
+usr/src/uts/intel/io/vmxnet/vmnet_def.h
+usr/src/uts/intel/io/vmxnet/vmxnet.c
+usr/src/uts/intel/io/vmxnet/vmxnet2_def.h
+usr/src/uts/intel/io/vmxnet/vmxnet_def.h
 usr/src/uts/intel/sys/acpi/acapps.h
 usr/src/uts/intel/sys/acpi/accommon.h
 usr/src/uts/intel/sys/acpi/acconfig.h
diff --git a/exception_lists/hdrchk b/exception_lists/hdrchk
index 8985ced0e0..7c0313395e 100644
--- a/exception_lists/hdrchk
+++ b/exception_lists/hdrchk
@@ -366,6 +366,18 @@ usr/src/uts/common/io/e1000api/e1000_regs.h
 usr/src/uts/common/io/ixgbe/core/*
 usr/src/uts/common/io/i40e/core/i40e_adminq_cmd.h
 usr/src/uts/common/io/qede/*
+usr/src/uts/common/io/nfp/nfp.h
+usr/src/uts/common/io/nfp/nfpci.h
+usr/src/uts/common/io/nfp/nfp_error.h
+usr/src/uts/common/io/nfp/i21555.h
+usr/src/uts/common/io/nfp/nfp_common.h
+usr/src/uts/common/io/nfp/nfp_osif.h
+usr/src/uts/common/io/nfp/nfdev-solaris.h
+usr/src/uts/common/io/nfp/nfp_cmd.h
+usr/src/uts/common/io/nfp/nfp_hostif.h
+usr/src/uts/common/io/nfp/nfdev-common.h
+usr/src/uts/common/io/nfp/autoversion.h
+usr/src/uts/common/io/nfp/i21285.h
 usr/src/uts/common/io/udmf/dm9601reg.h
 usr/src/uts/common/io/upf/adm8511reg.h
 usr/src/uts/common/io/urf/rtl8150reg.h
diff --git a/exception_lists/keywords b/exception_lists/keywords
index 5c44c20350..4db53981e3 100644
--- a/exception_lists/keywords
+++ b/exception_lists/keywords
@@ -22,6 +22,7 @@
 # Copyright 2017 Nexenta Systems, Inc.
 # Copyright (c) 2013 by Delphix. All rights reserved.
 # Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright 2018 Joyent, Inc.
 # Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
 #
 
@@ -36,6 +37,7 @@ usr/src/data/locale/data/zh_SG.UTF-8.src
 usr/src/data/locale/data/zh_TW.UTF-8.src
 usr/src/data/terminfo/termcap.src
 usr/src/data/terminfo/terminfo.src
+usr/src/data/ucode/amd/*
 usr/src/data/ucode/intel/*
 usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v15.dat.bz2
 usr/src/test/zfs-tests/tests/functional/delegate/delegate_common.kshlib
diff --git a/exception_lists/packaging b/exception_lists/packaging
index e3ee4960d5..8925008038 100644
--- a/exception_lists/packaging
+++ b/exception_lists/packaging
@@ -735,6 +735,7 @@ usr/lib/libsff.so
 #
 lib/amd64/libvmm.so			i386
 lib/amd64/libvmmapi.so			i386
+usr/include/bhyve.h			i386
 usr/include/libppt.h			i386
 usr/include/libvmm.h			i386
 usr/include/vmmapi.h			i386
diff --git a/exception_lists/wscheck b/exception_lists/wscheck
index 41e2272227..638acb3f52 100644
--- a/exception_lists/wscheck
+++ b/exception_lists/wscheck
@@ -14,13 +14,100 @@
 #
 syntax: glob
 
+usr/src/data/ucode/amd/*
+usr/src/data/ucode/intel/*
+usr/src/lib/libresolv2/common/*
+usr/src/lib/libresolv2_joy/common/*
+
+# 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/cmd/cxgbetool/*
 usr/src/cmd/smbsrv/testoplock/case*.ref
+usr/src/compat/freebsd/*.h
+usr/src/compat/freebsd/*/*.h
+usr/src/compat/freebsd/amd64/machine/*.h
 usr/src/data/hwdata/pci.ids
 usr/src/data/hwdata/usb.ids
 usr/src/data/perfmon/readme.txt
 usr/src/data/ucode/amd/*
 usr/src/data/ucode/intel/*
+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
+usr/src/uts/common/io/qede/*
+usr/src/uts/common/io/i40e/core/*
 usr/src/test/crypto-tests/tests/digest/data/*.rsp
 usr/src/test/os-tests/tests/definit/init.data
 usr/src/test/util-tests/tests/dis/i386/*.out
@@ -33,6 +120,7 @@ usr/src/uts/common/io/i40e/core/*
 usr/src/uts/common/io/ixgbe/core/*
 usr/src/contrib/*
 usr/src/cmd/ast/libshell/misc/shell_styleguide.docbook
+usr/src/test/util-tests/tests/dis/i386/*.out
 
 # bhyve sources
 usr/src/cmd/bhyve/acpi.[ch]