Merge branch 'master' into mlxcx

Author: danmcd

exception_lists/check_rtime

@@ -235,6 +235,8 @@ FORBIDDEN_DEP   usr/lib/netsvc/yp/ypxfrd        # C++
 # libfakekernel is a test environment, not intended for general use
 FORBIDDEN libfakekernel\.so
 FORBIDDEN_DEP opt/smbsrv-tests/tests/smb_sid/large_sids_kern
+FORBIDDEN_DEP opt/os-tests/tests/ksid/ksid.32
+FORBIDDEN_DEP opt/os-tests/tests/ksid/ksid.64
 FORBIDDEN_DEP usr/MACH(lib)/libzpool.so.1
 FORBIDDEN_DEP usr/bin/ztest
 FORBIDDEN_DEP usr/bin/raidz_test

exception_lists/copyright

@@ -414,6 +414,7 @@ usr/src/test/crypto-tests/tests/digest/data/*.rsp
 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/os-tests/tests/xsave/data/*
 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*

exception_lists/cstyle

@@ -88,7 +88,6 @@ usr/src/cmd/pools/poold/libjkstat/jkstat.h
 usr/src/cmd/pools/poold/libjlgrp/jlgrp.h
 usr/src/cmd/pools/poold/libjpool/jpool.h
 usr/src/cmd/pools/poold/libjsyslog/jsyslog.h
-usr/src/cmd/print/printmgr/com/sun/admin/pm/server/com_sun_admin_pm_server_DoPrinterNS.h
 usr/src/cmd/ttymon/sttyparse.c
 usr/src/cmd/vi/
 usr/src/common/ficl/ficltokens.h
@@ -822,149 +821,7 @@ usr/src/uts/common/inet/cc/cc_module.h
 usr/src/uts/common/inet/cc/cc_newreno.c
 usr/src/uts/common/io/bnx/570x/*
 usr/src/uts/common/io/bnx/include/*
-usr/src/uts/common/io/bnxe/577xx/common/bnxe_clc.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/ecore/ecore_common.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/ecore/ecore_init_ops.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/ecore/ecore_init.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/ecore/ecore_sp_verbs.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/ecore/ecore_sp_verbs.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/include/bcm_utils.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/include/cyclic_oper.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/include/debug.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/include/l4/mm_l4if.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/include/l5/mm_l5if.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/include/mm_dos.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/include/mm_linux.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/include/mm_ndismono.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/include/mm_solaris.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/include/mm_uefi.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/include/mm_user_mode_debug.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/include/mm_vbd.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/include/mm.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/include/utils.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/include/vm/hw_channel.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/include/vm/vfpf_if.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/bd_chain_st.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/bd_chain.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/bnxe_context.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/bnxe_hw_debug.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/context.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/hw_debug.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/hw_setup.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/l2_dbg.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_dcbx_mp.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_dcbx_mp.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_dcbx.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_desc.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_devinfo.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_dmae.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_dmae.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_er.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_hw_access.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_hw_attn.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_hw_init_reset.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_main.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_mcp.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_niv.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_nvram.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_pf.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_phy.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_power.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_recv.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_resc.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_sb.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_send.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_sp_req_mgr.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_sp_req_mgr.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_sp.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_stats.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/device/lm_util.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/5710_hsi.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/57710_init_values.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/57710_int_offsets.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/57711_init_values.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/57711_int_offsets.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/57712_init_values.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/57712_int_offsets.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/577xx_int_offsets.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/57xx_fcoe_constants.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/57xx_fcoe_rfc_constants.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/57xx_iscsi_constants.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/57xx_iscsi_rfc_constants.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/57xx_l5cm_constants.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/bnxe_fw_funcs.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/eth_constants.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/everest_iscsi_constants.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/everest_l5cm_constants.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/fcoe_constants.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/fw_defs.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/init_defs.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/microcode_constants.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/rdma_constants.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/tcp_constants.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/fw/toe_constants.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/include/command.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/include/common_uif.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/include/lm_stats.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/include/lm.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/include/lm5710_hsi.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/include/lm5710.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l4/include/lm_l4if.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l4/include/lm_l4st.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l4/lm_l4fp.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l4/lm_l4fp.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l4/lm_l4rx.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l4/lm_l4sp.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l4/lm_l4sp.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l4/lm_l4tx.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l5/include/lm_l5if.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l5/include/lm_l5st.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l5/lm_l5.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/l5/lm_l5sp.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/vf/basic_vf/lm_vf.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/vf/basic_vf/lm_vf.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/vf/channel_vf/lm_vf.c
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/vf/channel_vf/lm_vf.h
-usr/src/uts/common/io/bnxe/577xx/drivers/common/lm/vf/common/lm_vf_common.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/57712_reg.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/aeu_inputs.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/bigmac_addresses.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/cdu_def.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/clc_reg.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/clc.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/dbg_bus.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/dbu_reg_Driver.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/dmae_clients.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/emac_reg_driver.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/general_atten_bits.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/grc_addr.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/hw_dump.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/igu_def.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/misc_bits.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/pcics_reg_driver.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/phy_reg.h
-usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/prs_flags.h
-usr/src/uts/common/io/bnxe/577xx/hsi/mcp/append.h
-usr/src/uts/common/io/bnxe/577xx/hsi/mcp/bdn.h
-usr/src/uts/common/io/bnxe/577xx/hsi/mcp/code_swap_def.h
-usr/src/uts/common/io/bnxe/577xx/hsi/mcp/dev_info.h
-usr/src/uts/common/io/bnxe/577xx/hsi/mcp/mac_drv_info.h
-usr/src/uts/common/io/bnxe/577xx/hsi/mcp/mac_stats.h
-usr/src/uts/common/io/bnxe/577xx/hsi/mcp/mac_stx.h
-usr/src/uts/common/io/bnxe/577xx/hsi/mcp/mcp_fio.h
-usr/src/uts/common/io/bnxe/577xx/hsi/mcp/mcp_shmem.h
-usr/src/uts/common/io/bnxe/577xx/hsi/mcp/multi_thread_def.h
-usr/src/uts/common/io/bnxe/577xx/hsi/mcp/ncsi_basic_types.h
-usr/src/uts/common/io/bnxe/577xx/hsi/mcp/ncsi_cmds.h
-usr/src/uts/common/io/bnxe/577xx/hsi/mcp/nvm_map.h
-usr/src/uts/common/io/bnxe/577xx/hsi/mcp/shmem.h
-usr/src/uts/common/io/bnxe/577xx/include/bcmtype.h
-usr/src/uts/common/io/bnxe/577xx/include/iscsi_info.h
-usr/src/uts/common/io/bnxe/577xx/include/l4debug.h
-usr/src/uts/common/io/bnxe/577xx/include/l4states.h
-usr/src/uts/common/io/bnxe/577xx/include/license.h
-usr/src/uts/common/io/bnxe/577xx/include/listq.h
-usr/src/uts/common/io/bnxe/577xx/include/lm_defs.h
+usr/src/uts/common/io/bnxe/577xx/*
 usr/src/uts/common/io/bnxe/bnxe_binding.h
 usr/src/uts/common/io/bnxe/bnxe_cfg.c
 usr/src/uts/common/io/bnxe/bnxe_debug.c

exception_lists/hdrchk

@@ -27,7 +27,6 @@ usr/src/cmd/pools/poold/libjkstat/jkstat.h
 usr/src/cmd/pools/poold/libjlgrp/jlgrp.h
 usr/src/cmd/pools/poold/libjpool/jpool.h
 usr/src/cmd/pools/poold/libjsyslog/jsyslog.h
-usr/src/cmd/print/printmgr/com/sun/admin/pm/server/com_sun_admin_pm_server_DoPrinterNS.h
 usr/src/common/ficl/ficltokens.h
 usr/src/contrib
 usr/src/grub/grub-0.97/stage2/shared.h

exception_lists/interface_check

@@ -89,7 +89,6 @@ NOVERDEF	^usr/lib/libwrap\.so\.1\.0$
 NOVERDEF	^usr/lib/locale/MACH(iso_8859_1)/iso_8859_1\.so\.3$
 NOVERDEF	^usr/lib/picl/plugins$
 NOVERDEF	^usr/sadm/admin/dhcpmgr/dhcpmgr\.so\.1$
-NOVERDEF	^usr/sadm/admin/printmgr/lib/libpmgr\.so\.1$
 
 
 # Objects that are allowed to deviate from our standard version

exception_lists/wscheck

@@ -113,6 +113,7 @@ usr/src/test/os-tests/tests/definit/init.data
 usr/src/test/util-tests/tests/dis/i386/*.out
 usr/src/test/libc-tests/tests/qsort/*.c
 usr/src/tools/smatch/src/*
+usr/src/uts/common/io/bnxe/577xx/*
 usr/src/uts/common/io/cxgbe/*
 usr/src/uts/common/io/e1000api/*
 usr/src/uts/common/io/qede/*

mancheck.conf

@@ -1,5 +1,6 @@
 /*
  * Copyright 2015 Joyent, Inc.
+ * Copyright 2023 MNX Cloud, Inc.
  */
 
 /*
@@ -27,6 +28,7 @@
 
 -page "libtsol.3lib";
 -page "libtsnet.3lib";
+-page "libslp.3lib";
 -page "librsm.3lib";
 -page "libpapi.3lib";
 
@@ -42,11 +44,14 @@
 -page "audio.4i";
 -page "agpgart_io.4i";
 -page "ibmf.4";
+-page "slp.4p";
 
 +section "5*";
 -page "volume-defaults.5";
 -page "md.cf.5";
 -page "wanboot.conf.5";
+-page "slp.conf.5";
+-page "slpd.reg.5";
 
 +section "7*";
 -page "pkcs11_tpm.7";