Merge pull request #1569 from hadfl/upstream_merge/2025032301

Upstream merge/2025032301

Author: citrus-it

Diff for: exception_lists/copyright

@@ -395,6 +395,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/os-tests/tests/hexdump/data/*
+usr/src/test/os-tests/tests/mac/data/*
 usr/src/test/os-tests/tests/xsave/data/*
 usr/src/test/util-tests/tests/cpio/files/*
 usr/src/test/util-tests/tests/dis/*/*.out

Diff for: exception_lists/wscheck

@@ -9,7 +9,7 @@
 # http://www.illumos.org/license/CDDL.
 #
 # Copyright 2019 Joyent, Inc.
-# Copyright 2020 Oxide Computer Company
+# Copyright 2025 Oxide Computer Company
 # Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
 # Copyright 2023 Racktop Systems, Inc.
 #
@@ -26,6 +26,7 @@ usr/src/data/ucode/intel/*
 usr/src/test/crypto-tests/tests/digest/data/*.rsp
 usr/src/test/os-tests/tests/definit/init.data
 usr/src/test/os-tests/tests/hexdump/data/*
+usr/src/test/os-tests/tests/mac/data/*
 usr/src/test/util-tests/tests/dis/i386/*.out
 usr/src/test/libc-tests/tests/qsort/*.c
 usr/src/tools/smatch/src/*

Diff for: usr/src/boot/Makefile.version

@@ -35,4 +35,4 @@ LOADER_VERSION = 1.1
 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes.
 # The version is processed from left to right, the version number can only
 # be increased.
-BOOT_VERSION = $(LOADER_VERSION)-2024.10.09.1
+BOOT_VERSION = $(LOADER_VERSION)-2025.03.13.2