[illumos-gate merge]

commit 35d41f28ed229ff7c40e0acb85ce4465390ac9bb
    13637 Support promiscuous mode on vioif interfaces
commit 3bbba396f8599b5a3225ae7d8bb0119abdfaa427
    13681 libfruraw: writing 1 byte into a region of size 0
commit fd8be61dc48514ff8e3bb97fdb04972e2765a6da
    13651 libucb: cast between incompatible function types
commit c1ba859699f12f01e0a0ae33b874b48f666aac62
    13518 sun_sas: multiply-defined symbols
commit 91b4b5393fe18d32505f967d482b81eef7f68d22
    13650 sendmail: writing 1 byte into a region of size 0
commit 472cd20d26008f77084ade4c2048159b98c2b705
    13668 mdns: update to mDNSResponder-1310.80.1
commit e4cc4004bc22385fe82642b211027316c120a5a5
    13672 nvmeadm list could support parsable output
commit 561433436929270392bcec8fb5afe3f73597dd55
    13533 rdist: symbol 'buf' is multiply-defined
commit 81de4da4caf1b6a02c80229f9f948f69e09f9719
    13626 libsldap: implicit conversion from 'enum <anonymous>'
commit a0570dbda2f64cada915185eb4e1b42c3b4bf755
    13671 profiles -l can crash in ldap backend
commit b89fc615f42c703d6100c78de04791708d190e5e
    13658 exception_lists/cstyle has stale entries

Conflicts:
    exception_lists/cstyle

2 files changed, 150 insertions, 172 deletions

diff --git a/exception_lists/cstyle b/exception_lists/cstyle
index 60882ba8b6..c073d4a362 100644
--- a/exception_lists/cstyle
+++ b/exception_lists/cstyle
@@ -3,22 +3,21 @@ 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/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/common/acpica/tables/tbprint.c
+usr/src/common/acpica/tables/tbxfroot.c
+usr/src/common/acpica/utilities/utbuffer.c
 usr/src/cmd/acpi/acpixtract/acpixtract.[ch]
 usr/src/cmd/acpi/acpixtract/axmain.[ch]
 usr/src/cmd/acpi/acpixtract/axutils.[ch]
 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
-sr/src/cmd/ast/libshell/common/illumos_cmdlist.h
+usr/src/common/acpica/utilities/utascii.c
+usr/src/common/acpica/utilities/utdebug.c
+usr/src/common/acpica/utilities/utexcep.c
+usr/src/common/acpica/utilities/utglobal.c
+usr/src/common/acpica/utilities/utmath.c
+usr/src/common/acpica/utilities/utnonansi.c
+usr/src/common/acpica/utilities/utxferror.c
+usr/src/cmd/ast/libshell/common/illumos_cmdlist.h
 usr/src/cmd/cxgbetool/*
 usr/src/cmd/hal/tools/hal_set_property.c
 usr/src/cmd/krb5/kadmin/cli/kadmin_ct.c
@@ -103,7 +102,7 @@ usr/src/common/bzip2/decompress.c
 usr/src/common/bzip2/bzlib_private.h
 usr/src/common/bzip2/huffman.c
 usr/src/common/crypto/chacha/chacha.c
-usr/src/contrib
+usr/src/contrib/
 usr/src/grub/grub-0.97/grub/asmstub.c
 usr/src/grub/grub-0.97/stage2/bios.c
 usr/src/grub/grub-0.97/stage2/builtins.c
@@ -117,11 +116,9 @@ usr/src/grub/grub-0.97/stage2/stage1_5.c
 usr/src/lib/libadt_jni/com/sun/audit/AuditSession.h
 usr/src/lib/libc/port/gen/arc4random_uniform.c
 usr/src/lib/libdtrace_jni/java/native/LocalConsumer.h
-usr/src/lib/libdwarf/common/cmplrs/dwarf_addr_finder.h
 usr/src/lib/libdwarf/common/config.h
 usr/src/lib/libdwarf/common/dwarf_abbrev.c
 usr/src/lib/libdwarf/common/dwarf_abbrev.h
-usr/src/lib/libdwarf/common/dwarf_addr_finder.c
 usr/src/lib/libdwarf/common/dwarf_alloc.c
 usr/src/lib/libdwarf/common/dwarf_alloc.h
 usr/src/lib/libdwarf/common/dwarf_arange.c
@@ -137,7 +134,6 @@ usr/src/lib/libdwarf/common/dwarf_form.c
 usr/src/lib/libdwarf/common/dwarf_frame.c
 usr/src/lib/libdwarf/common/dwarf_frame.h
 usr/src/lib/libdwarf/common/dwarf_frame2.c
-usr/src/lib/libdwarf/common/dwarf_frame3.c
 usr/src/lib/libdwarf/common/dwarf_funcs.c
 usr/src/lib/libdwarf/common/dwarf_funcs.h
 usr/src/lib/libdwarf/common/dwarf_global.c
@@ -149,7 +145,6 @@ usr/src/lib/libdwarf/common/dwarf_init_finish.c
 usr/src/lib/libdwarf/common/dwarf_leb.c
 usr/src/lib/libdwarf/common/dwarf_line.c
 usr/src/lib/libdwarf/common/dwarf_line.h
-usr/src/lib/libdwarf/common/dwarf_line2.c
 usr/src/lib/libdwarf/common/dwarf_loc.c
 usr/src/lib/libdwarf/common/dwarf_loc.h
 usr/src/lib/libdwarf/common/dwarf_macro.c
@@ -162,8 +157,6 @@ usr/src/lib/libdwarf/common/dwarf_print_lines.c
 usr/src/lib/libdwarf/common/dwarf_pubtypes.c
 usr/src/lib/libdwarf/common/dwarf_query.c
 usr/src/lib/libdwarf/common/dwarf_ranges.c
-usr/src/lib/libdwarf/common/dwarf_sort_line.c
-usr/src/lib/libdwarf/common/dwarf_string.c
 usr/src/lib/libdwarf/common/dwarf_stubs.c
 usr/src/lib/libdwarf/common/dwarf_types.c
 usr/src/lib/libdwarf/common/dwarf_types.h
@@ -422,7 +415,6 @@ usr/src/lib/gss_mechs/mech_krb5/krb5/os/thread_safe.c
 usr/src/lib/gss_mechs/mech_krb5/krb5/os/unlck_file.c
 usr/src/lib/gss_mechs/mech_krb5/krb5/os/ustime.c
 usr/src/lib/gss_mechs/mech_krb5/krb5/os/write_msg.c
-usr/src/lib/gss_mechs/mech_krb5/krb5/posix/daemon.c
 usr/src/lib/gss_mechs/mech_krb5/krb5/posix/setenv.c
 usr/src/lib/gss_mechs/mech_krb5/krb5/rcache/rc_base.h
 usr/src/lib/gss_mechs/mech_krb5/krb5/rcache/rc_conv.c
@@ -1056,6 +1048,7 @@ usr/src/uts/common/io/i40e/core/virtchnl.h
 usr/src/uts/common/io/iwn/if_iwn.c
 usr/src/uts/common/io/iwn/if_iwnreg.h
 usr/src/uts/common/io/iwn/if_iwnvar.h
+usr/src/uts/common/io/ixgbe/ixgbe_osdep.h
 usr/src/uts/common/io/ixgbe/core/ixgbe_82598.c
 usr/src/uts/common/io/ixgbe/core/ixgbe_82598.h
 usr/src/uts/common/io/ixgbe/core/ixgbe_82599.c
@@ -1072,7 +1065,6 @@ usr/src/uts/common/io/ixgbe/core/ixgbe_dcb_82599.c
 usr/src/uts/common/io/ixgbe/core/ixgbe_dcb_82599.h
 usr/src/uts/common/io/ixgbe/core/ixgbe_mbx.c
 usr/src/uts/common/io/ixgbe/core/ixgbe_mbx.h
-usr/src/uts/common/io/ixgbe/core/ixgbe_osdep.h
 usr/src/uts/common/io/ixgbe/core/ixgbe_phy.c
 usr/src/uts/common/io/ixgbe/core/ixgbe_phy.h
 usr/src/uts/common/io/ixgbe/core/ixgbe_type.h
@@ -1162,154 +1154,142 @@ usr/src/uts/common/io/sfxge/common/siena_phy.c
 usr/src/uts/common/io/sfxge/common/siena_sram.c
 usr/src/uts/common/io/sfxge/common/siena_vpd.c
 usr/src/uts/common/sys/scsi/adapters/mpt_sas/mpi/*
-usr/src/uts/intel/io/acpica/debugger/dbcmds.c
-usr/src/uts/intel/io/acpica/debugger/dbdisply.c
-usr/src/uts/intel/io/acpica/debugger/dbexec.c
-usr/src/uts/intel/io/acpica/debugger/dbfileio.c
-usr/src/uts/intel/io/acpica/debugger/dbhistry.c
-usr/src/uts/intel/io/acpica/debugger/dbinput.c
-usr/src/uts/intel/io/acpica/debugger/dbmethod.c
-usr/src/uts/intel/io/acpica/debugger/dbnames.c
-usr/src/uts/intel/io/acpica/debugger/dbstats.c
-usr/src/uts/intel/io/acpica/debugger/dbutils.c
-usr/src/uts/intel/io/acpica/debugger/dbxface.c
-usr/src/uts/intel/io/acpica/disassembler/dmbuffer.c
-usr/src/uts/intel/io/acpica/disassembler/dmnames.c
-usr/src/uts/intel/io/acpica/disassembler/dmobject.c
-usr/src/uts/intel/io/acpica/disassembler/dmopcode.c
-usr/src/uts/intel/io/acpica/disassembler/dmresrc.c
-usr/src/uts/intel/io/acpica/disassembler/dmresrcl.c
-usr/src/uts/intel/io/acpica/disassembler/dmresrcs.c
-usr/src/uts/intel/io/acpica/disassembler/dmutils.c
-usr/src/uts/intel/io/acpica/disassembler/dmwalk.c
-usr/src/uts/intel/io/acpica/dispatcher/dsargs.c
-usr/src/uts/intel/io/acpica/dispatcher/dscontrol.c
-usr/src/uts/intel/io/acpica/dispatcher/dsfield.c
-usr/src/uts/intel/io/acpica/dispatcher/dsinit.c
-usr/src/uts/intel/io/acpica/dispatcher/dsmethod.c
-usr/src/uts/intel/io/acpica/dispatcher/dsmthdat.c
-usr/src/uts/intel/io/acpica/dispatcher/dsobject.c
-usr/src/uts/intel/io/acpica/dispatcher/dsopcode.c
-usr/src/uts/intel/io/acpica/dispatcher/dsutils.c
-usr/src/uts/intel/io/acpica/dispatcher/dswexec.c
-usr/src/uts/intel/io/acpica/dispatcher/dswload.c
-usr/src/uts/intel/io/acpica/dispatcher/dswload2.c
-usr/src/uts/intel/io/acpica/dispatcher/dswscope.c
-usr/src/uts/intel/io/acpica/dispatcher/dswstate.c
-usr/src/uts/intel/io/acpica/events/evevent.c
-usr/src/uts/intel/io/acpica/events/evglock.c
-usr/src/uts/intel/io/acpica/events/evgpe.c
-usr/src/uts/intel/io/acpica/events/evgpeblk.c
-usr/src/uts/intel/io/acpica/events/evgpeinit.c
-usr/src/uts/intel/io/acpica/events/evgpeutil.c
-usr/src/uts/intel/io/acpica/events/evmisc.c
-usr/src/uts/intel/io/acpica/events/evregion.c
-usr/src/uts/intel/io/acpica/events/evrgnini.c
-usr/src/uts/intel/io/acpica/events/evsci.c
-usr/src/uts/intel/io/acpica/events/evxface.c
-usr/src/uts/intel/io/acpica/events/evxfevnt.c
-usr/src/uts/intel/io/acpica/events/evxfgpe.c
-usr/src/uts/intel/io/acpica/events/evxfregn.c
-usr/src/uts/intel/io/acpica/executer/exconfig.c
-usr/src/uts/intel/io/acpica/executer/exconvrt.c
-usr/src/uts/intel/io/acpica/executer/excreate.c
-usr/src/uts/intel/io/acpica/executer/exdebug.c
-usr/src/uts/intel/io/acpica/executer/exdump.c
-usr/src/uts/intel/io/acpica/executer/exfield.c
-usr/src/uts/intel/io/acpica/executer/exfldio.c
-usr/src/uts/intel/io/acpica/executer/exmisc.c
-usr/src/uts/intel/io/acpica/executer/exmutex.c
-usr/src/uts/intel/io/acpica/executer/exnames.c
-usr/src/uts/intel/io/acpica/executer/exoparg1.c
-usr/src/uts/intel/io/acpica/executer/exoparg2.c
-usr/src/uts/intel/io/acpica/executer/exoparg3.c
-usr/src/uts/intel/io/acpica/executer/exoparg6.c
-usr/src/uts/intel/io/acpica/executer/exprep.c
-usr/src/uts/intel/io/acpica/executer/exregion.c
-usr/src/uts/intel/io/acpica/executer/exresnte.c
-usr/src/uts/intel/io/acpica/executer/exresolv.c
-usr/src/uts/intel/io/acpica/executer/exresop.c
-usr/src/uts/intel/io/acpica/executer/exstore.c
-usr/src/uts/intel/io/acpica/executer/exstoren.c
-usr/src/uts/intel/io/acpica/executer/exstorob.c
-usr/src/uts/intel/io/acpica/executer/exsystem.c
-usr/src/uts/intel/io/acpica/executer/exutils.c
-usr/src/uts/intel/io/acpica/hardware/hwacpi.c
-usr/src/uts/intel/io/acpica/hardware/hwgpe.c
-usr/src/uts/intel/io/acpica/hardware/hwpci.c
-usr/src/uts/intel/io/acpica/hardware/hwregs.c
-usr/src/uts/intel/io/acpica/hardware/hwsleep.c
-usr/src/uts/intel/io/acpica/hardware/hwtimer.c
-usr/src/uts/intel/io/acpica/hardware/hwvalid.c
-usr/src/uts/intel/io/acpica/hardware/hwxface.c
-usr/src/uts/intel/io/acpica/namespace/nsaccess.c
-usr/src/uts/intel/io/acpica/namespace/nsalloc.c
-usr/src/uts/intel/io/acpica/namespace/nsdump.c
-usr/src/uts/intel/io/acpica/namespace/nsdumpdv.c
-usr/src/uts/intel/io/acpica/namespace/nseval.c
-usr/src/uts/intel/io/acpica/namespace/nsinit.c
-usr/src/uts/intel/io/acpica/namespace/nsload.c
-usr/src/uts/intel/io/acpica/namespace/nsnames.c
-usr/src/uts/intel/io/acpica/namespace/nsobject.c
-usr/src/uts/intel/io/acpica/namespace/nsparse.c
-usr/src/uts/intel/io/acpica/namespace/nspredef.c
-usr/src/uts/intel/io/acpica/namespace/nsrepair.c
-usr/src/uts/intel/io/acpica/namespace/nsrepair2.c
-usr/src/uts/intel/io/acpica/namespace/nssearch.c
-usr/src/uts/intel/io/acpica/namespace/nsutils.c
-usr/src/uts/intel/io/acpica/namespace/nswalk.c
-usr/src/uts/intel/io/acpica/namespace/nsxfeval.c
-usr/src/uts/intel/io/acpica/namespace/nsxfname.c
-usr/src/uts/intel/io/acpica/namespace/nsxfobj.c
-usr/src/uts/intel/io/acpica/parser/psargs.c
-usr/src/uts/intel/io/acpica/parser/psloop.c
-usr/src/uts/intel/io/acpica/parser/psopcode.c
-usr/src/uts/intel/io/acpica/parser/psparse.c
-usr/src/uts/intel/io/acpica/parser/psscope.c
-usr/src/uts/intel/io/acpica/parser/pstree.c
-usr/src/uts/intel/io/acpica/parser/psutils.c
-usr/src/uts/intel/io/acpica/parser/pswalk.c
-usr/src/uts/intel/io/acpica/parser/psxface.c
-usr/src/uts/intel/io/acpica/resources/rsaddr.c
-usr/src/uts/intel/io/acpica/resources/rscalc.c
-usr/src/uts/intel/io/acpica/resources/rscreate.c
-usr/src/uts/intel/io/acpica/resources/rsdump.c
-usr/src/uts/intel/io/acpica/resources/rsinfo.c
-usr/src/uts/intel/io/acpica/resources/rsio.c
-usr/src/uts/intel/io/acpica/resources/rsirq.c
-usr/src/uts/intel/io/acpica/resources/rslist.c
-usr/src/uts/intel/io/acpica/resources/rsmemory.c
-usr/src/uts/intel/io/acpica/resources/rsmisc.c
-usr/src/uts/intel/io/acpica/resources/rsutils.c
-usr/src/uts/intel/io/acpica/resources/rsxface.c
-usr/src/uts/intel/io/acpica/tables/tbfadt.c
-usr/src/uts/intel/io/acpica/tables/tbfind.c
-usr/src/uts/intel/io/acpica/tables/tbinstal.c
-usr/src/uts/intel/io/acpica/tables/tbutils.c
-usr/src/uts/intel/io/acpica/tables/tbxface.c
-usr/src/uts/intel/io/acpica/tables/tbxfroot.c
-usr/src/uts/intel/io/acpica/utilities/utalloc.c
-usr/src/uts/intel/io/acpica/utilities/utcache.c
-usr/src/uts/intel/io/acpica/utilities/utclib.c
-usr/src/uts/intel/io/acpica/utilities/utcopy.c
-usr/src/uts/intel/io/acpica/utilities/utdebug.c
-usr/src/uts/intel/io/acpica/utilities/utdecode.c
-usr/src/uts/intel/io/acpica/utilities/utdelete.c
-usr/src/uts/intel/io/acpica/utilities/uteval.c
-usr/src/uts/intel/io/acpica/utilities/utglobal.c
-usr/src/uts/intel/io/acpica/utilities/utids.c
-usr/src/uts/intel/io/acpica/utilities/utinit.c
-usr/src/uts/intel/io/acpica/utilities/utlock.c
-usr/src/uts/intel/io/acpica/utilities/utmath.c
-usr/src/uts/intel/io/acpica/utilities/utmisc.c
-usr/src/uts/intel/io/acpica/utilities/utmutex.c
-usr/src/uts/intel/io/acpica/utilities/utobject.c
-usr/src/uts/intel/io/acpica/utilities/utosi.c
-usr/src/uts/intel/io/acpica/utilities/utresrc.c
-usr/src/uts/intel/io/acpica/utilities/utstate.c
-usr/src/uts/intel/io/acpica/utilities/uttrack.c
-usr/src/uts/intel/io/acpica/utilities/utxface.c
-usr/src/uts/intel/io/acpica/utilities/utxferror.c
+usr/src/common/acpica/disassembler/dmbuffer.c
+usr/src/common/acpica/disassembler/dmnames.c
+usr/src/common/acpica/disassembler/dmopcode.c
+usr/src/common/acpica/disassembler/dmresrc.c
+usr/src/common/acpica/disassembler/dmresrcl.c
+usr/src/common/acpica/disassembler/dmresrcs.c
+usr/src/common/acpica/disassembler/dmutils.c
+usr/src/common/acpica/disassembler/dmwalk.c
+usr/src/common/acpica/dispatcher/dsargs.c
+usr/src/common/acpica/dispatcher/dscontrol.c
+usr/src/common/acpica/dispatcher/dsfield.c
+usr/src/common/acpica/dispatcher/dsinit.c
+usr/src/common/acpica/dispatcher/dsmethod.c
+usr/src/common/acpica/dispatcher/dsmthdat.c
+usr/src/common/acpica/dispatcher/dsobject.c
+usr/src/common/acpica/dispatcher/dsopcode.c
+usr/src/common/acpica/dispatcher/dsutils.c
+usr/src/common/acpica/dispatcher/dswexec.c
+usr/src/common/acpica/dispatcher/dswload.c
+usr/src/common/acpica/dispatcher/dswload2.c
+usr/src/common/acpica/dispatcher/dswscope.c
+usr/src/common/acpica/dispatcher/dswstate.c
+usr/src/common/acpica/events/evevent.c
+usr/src/common/acpica/events/evglock.c
+usr/src/common/acpica/events/evgpe.c
+usr/src/common/acpica/events/evgpeblk.c
+usr/src/common/acpica/events/evgpeinit.c
+usr/src/common/acpica/events/evgpeutil.c
+usr/src/common/acpica/events/evmisc.c
+usr/src/common/acpica/events/evregion.c
+usr/src/common/acpica/events/evrgnini.c
+usr/src/common/acpica/events/evsci.c
+usr/src/common/acpica/events/evxface.c
+usr/src/common/acpica/events/evxfevnt.c
+usr/src/common/acpica/events/evxfgpe.c
+usr/src/common/acpica/events/evxfregn.c
+usr/src/common/acpica/executer/exconfig.c
+usr/src/common/acpica/executer/exconvrt.c
+usr/src/common/acpica/executer/excreate.c
+usr/src/common/acpica/executer/exdebug.c
+usr/src/common/acpica/executer/exdump.c
+usr/src/common/acpica/executer/exfield.c
+usr/src/common/acpica/executer/exfldio.c
+usr/src/common/acpica/executer/exmisc.c
+usr/src/common/acpica/executer/exmutex.c
+usr/src/common/acpica/executer/exnames.c
+usr/src/common/acpica/executer/exoparg1.c
+usr/src/common/acpica/executer/exoparg2.c
+usr/src/common/acpica/executer/exoparg3.c
+usr/src/common/acpica/executer/exoparg6.c
+usr/src/common/acpica/executer/exprep.c
+usr/src/common/acpica/executer/exregion.c
+usr/src/common/acpica/executer/exresnte.c
+usr/src/common/acpica/executer/exresolv.c
+usr/src/common/acpica/executer/exresop.c
+usr/src/common/acpica/executer/exstore.c
+usr/src/common/acpica/executer/exstoren.c
+usr/src/common/acpica/executer/exstorob.c
+usr/src/common/acpica/executer/exsystem.c
+usr/src/common/acpica/executer/exutils.c
+usr/src/common/acpica/hardware/hwacpi.c
+usr/src/common/acpica/hardware/hwgpe.c
+usr/src/common/acpica/hardware/hwpci.c
+usr/src/common/acpica/hardware/hwregs.c
+usr/src/common/acpica/hardware/hwsleep.c
+usr/src/common/acpica/hardware/hwtimer.c
+usr/src/common/acpica/hardware/hwvalid.c
+usr/src/common/acpica/hardware/hwxface.c
+usr/src/common/acpica/namespace/nsaccess.c
+usr/src/common/acpica/namespace/nsalloc.c
+usr/src/common/acpica/namespace/nsdump.c
+usr/src/common/acpica/namespace/nsdumpdv.c
+usr/src/common/acpica/namespace/nseval.c
+usr/src/common/acpica/namespace/nsinit.c
+usr/src/common/acpica/namespace/nsload.c
+usr/src/common/acpica/namespace/nsnames.c
+usr/src/common/acpica/namespace/nsobject.c
+usr/src/common/acpica/namespace/nsparse.c
+usr/src/common/acpica/namespace/nspredef.c
+usr/src/common/acpica/namespace/nsrepair.c
+usr/src/common/acpica/namespace/nsrepair2.c
+usr/src/common/acpica/namespace/nssearch.c
+usr/src/common/acpica/namespace/nsutils.c
+usr/src/common/acpica/namespace/nswalk.c
+usr/src/common/acpica/namespace/nsxfeval.c
+usr/src/common/acpica/namespace/nsxfname.c
+usr/src/common/acpica/namespace/nsxfobj.c
+usr/src/common/acpica/parser/psargs.c
+usr/src/common/acpica/parser/psloop.c
+usr/src/common/acpica/parser/psopcode.c
+usr/src/common/acpica/parser/psparse.c
+usr/src/common/acpica/parser/psscope.c
+usr/src/common/acpica/parser/pstree.c
+usr/src/common/acpica/parser/psutils.c
+usr/src/common/acpica/parser/pswalk.c
+usr/src/common/acpica/parser/psxface.c
+usr/src/common/acpica/resources/rsaddr.c
+usr/src/common/acpica/resources/rscalc.c
+usr/src/common/acpica/resources/rscreate.c
+usr/src/common/acpica/resources/rsdump.c
+usr/src/common/acpica/resources/rsinfo.c
+usr/src/common/acpica/resources/rsio.c
+usr/src/common/acpica/resources/rsirq.c
+usr/src/common/acpica/resources/rslist.c
+usr/src/common/acpica/resources/rsmemory.c
+usr/src/common/acpica/resources/rsmisc.c
+usr/src/common/acpica/resources/rsutils.c
+usr/src/common/acpica/resources/rsxface.c
+usr/src/common/acpica/tables/tbfadt.c
+usr/src/common/acpica/tables/tbfind.c
+usr/src/common/acpica/tables/tbinstal.c
+usr/src/common/acpica/tables/tbutils.c
+usr/src/common/acpica/tables/tbxface.c
+usr/src/common/acpica/tables/tbxfroot.c
+usr/src/common/acpica/utilities/utalloc.c
+usr/src/common/acpica/utilities/utcache.c
+usr/src/common/acpica/utilities/utclib.c
+usr/src/common/acpica/utilities/utcopy.c
+usr/src/common/acpica/utilities/utdebug.c
+usr/src/common/acpica/utilities/utdecode.c
+usr/src/common/acpica/utilities/utdelete.c
+usr/src/common/acpica/utilities/uteval.c
+usr/src/common/acpica/utilities/utglobal.c
+usr/src/common/acpica/utilities/utids.c
+usr/src/common/acpica/utilities/utinit.c
+usr/src/common/acpica/utilities/utlock.c
+usr/src/common/acpica/utilities/utmath.c
+usr/src/common/acpica/utilities/utmisc.c
+usr/src/common/acpica/utilities/utmutex.c
+usr/src/common/acpica/utilities/utobject.c
+usr/src/common/acpica/utilities/utosi.c
+usr/src/common/acpica/utilities/utresrc.c
+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
@@ -1415,7 +1395,6 @@ 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]
@@ -1432,7 +1411,6 @@ usr/src/cmd/bhyve/vga.[ch]
 usr/src/cmd/bhyve/vmgenc.[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/bhyve/*
 usr/src/contrib/bhyve/*
diff --git a/exception_lists/wscheck b/exception_lists/wscheck
index 2c0226f561..00956dd22d 100644
--- a/exception_lists/wscheck
+++ b/exception_lists/wscheck
@@ -114,7 +114,7 @@ usr/src/uts/common/io/e1000api/*
 usr/src/uts/common/io/qede/*
 usr/src/uts/common/io/i40e/core/*
 usr/src/uts/common/io/ixgbe/core/*
-usr/src/contrib/ast/*
+usr/src/contrib/*
 usr/src/cmd/ast/libshell/misc/shell_styleguide.docbook
 usr/src/test/util-tests/tests/dis/i386/*.out