Merge branch 'freebsd:main' into fuse__36

Author: rmscotty

.cirrus.yml

@@ -4,13 +4,13 @@ compute_engine_instance:
   # gcloud compute images list --project freebsd-org-cloud-dev --no-standard-images
   platform: freebsd
   image_project: freebsd-org-cloud-dev
-  image: freebsd-14-2-release-amd64-ufs
+  image: freebsd-14-3-release-amd64-ufs
   cpu: 8
   memory: 8G
   disk: 40
 
 env:
-  PKG_FORMAT: tar
+  PKG_LEVEL: 1
 
 task:
   matrix:
@@ -154,13 +154,13 @@ task:
   - su user -c "git config --global --add safe.directory $(pwd -P)"
 
   build_world_script:
-  - su user -c "make -j$(sysctl -n hw.ncpu) ${EXTRA_MAKE_FLAGS} CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes buildworld"
+  - su user -c "make -j$(nproc) ${EXTRA_MAKE_FLAGS} CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes buildworld"
 
   build_kernel_script:
-  - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes buildkernel"
+  - su user -c "make -j$(nproc) CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes buildkernel"
 
   package_script:
-  - su user -c "make CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes packages"
+  - su user -c "make -j$(nproc) CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes packages"
 
   package_check_script:
   - su user -c "/usr/libexec/flua tools/pkgbase/metalog_reader.lua -c /usr/obj/$(pwd -P)/${TARGET}.${TARGET_ARCH}/worldstage/METALOG"
@@ -213,7 +213,7 @@ precommit_task:
     - pkg --version
 
   ci_script:
-    - make -C tests/ci TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} CITYPE=smoke ci
+    - make -C tests/ci TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} CIENV=cirrus CITYPE=smoke ci
 
   post_script:
     - df -m

.clean_build_epoch

@@ -0,0 +1,7 @@
+# Add a new line containing a larger number than the last (e.g. YYYYMMDD) for
+# every change that breaks ABI or requires a full rebuild for some other reason.
+# Only the last entry is required, but having the full list may be useful for
+# looking at frequency of ABI breakage, etc.
+
+# 4757b351ea9: openssl: Import version 3.5.1
+20250807	# All OpenSSL-using bits need rebuilt

.git-blame-ignore-revs

@@ -8,6 +8,14 @@
 #
 # This file is sorted in git log order (newest commits first).
 
+# sys/bus.h style fixes
+22238759c57d942865cf9d1a355a0d04819eb621
+# sys/efi.h style(9) tweaks
+e584c46d8b60662ffb1f67c41dec13f391d3f199
+# sys/cpu.h style(9) fixes
+0737e2a961cd712fff5b548bb6b823e48a8b527d
+# witness white space cleanup and style(9) tweeks
+f5377665253b2b107ee8a4690ad2e6682375b304
 # style fixes for device_if.m
 ab43dbe0187ecdf1697726170fd4e19c373effcc
 # iflib style tweaks

.github/workflows/checklist.yml

@@ -88,7 +88,7 @@ jobs:
 
               /* Loop for each key in "checklist". */
               for (const c in checklist)
-                msg += "- " + c + "<sup>" + checklist[c].join(", ") + "</sup>\n";
+                msg += "- " + c + " (" + checklist[c].join(", ") + ")\n";
               msg += "\nPlease review [CONTRIBUTING.md](https://github.com/freebsd/freebsd-src/blob/main/CONTRIBUTING.md), then update and push your branch again.\n"
 
               comment_func({

.github/workflows/cross-bootstrap-tools.yml

@@ -22,9 +22,9 @@ jobs:
         include:
           # TODO: both Ubuntu and macOS have bmake packages, we should try them instead of bootstrapping our own copy.
           - os: ubuntu-22.04
-            compiler: clang-14
-            cross-bindir: /usr/lib/llvm-14/bin
-            pkgs: bmake libarchive-dev clang-14 lld-14
+            compiler: clang-15
+            cross-bindir: /usr/lib/llvm-15/bin
+            pkgs: bmake libarchive-dev clang-15 lld-15
           - os: ubuntu-24.04
             compiler: clang-18
             cross-bindir: /usr/lib/llvm-18/bin

.gitignore

@@ -29,3 +29,4 @@ tags
 .clangd
 .ccls-cache
 sys/*/compile
+/src.conf

.mailmap

@@ -12,7 +12,8 @@ Michal Meloun  <[email protected]> <[email protected]>
 Dmitriy Alexandrov <[email protected]> <[email protected]>
 Alfonso Gregory <[email protected]> <[email protected]>
 Alfonso Gregory <[email protected]> <[email protected]>
-Jose Luis Duran <[email protected]> <[email protected]>
+Jose Luis Duran <[email protected]> <[email protected]>
+Jose Luis Duran <[email protected]> <[email protected]>
 Val Packett <[email protected]> <[email protected]>
 Piotr Paweł Stefaniak <[email protected]> <[email protected]>
 Sumit Saxena <[email protected]> <[email protected]>
@@ -21,3 +22,4 @@ Ganael LAPLANCHE <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 Joyu Liao <[email protected]> <[email protected]>
 Joyu Liao <[email protected]> <[email protected]>
+<[email protected]> <[email protected]>

MAINTAINERS

@@ -111,6 +111,7 @@ sys/xen		royger		Pre-commit review recommended.
 tests			ngie,#test		Pre-commit review requested.
 tools/build	imp	Pre-commit review requested, especially to fix bootstrap issues.
 top(1)		eadler	Pre-commit review requested.
+ufshci(4)	jaeyoon	Pre-commit review requested.
 usr.sbin/bsdconfig	dteske	Pre-commit phabricator review requested.
 usr.sbin/dpv	dteske	Pre-commit review requested. Keep in sync with libdpv.
 usr.sbin/pkg	pkg@	Please coordinate behavior or flag changes with pkg team.

Makefile

@@ -175,7 +175,7 @@ TGTS=	all all-man buildenv buildenvvars buildetc buildkernel buildworld \
 	create-packages-world create-packages-kernel \
 	create-packages-kernel-repo create-packages-world-repo \
 	create-packages-source create-packages \
-	update-packages packages installconfig real-packages real-update-packages \
+	installconfig real-packages real-update-packages \
 	sign-packages package-pkg print-dir test-system-compiler test-system-linker \
 	test-includes
 
@@ -219,6 +219,8 @@ META_TGT_WHITELIST+=	build${libcompat}
 .ORDER: buildworld distribute
 .ORDER: buildworld distributeworld
 .ORDER: buildworld buildkernel
+.ORDER: buildworld packages
+.ORDER: buildworld update-packages
 .ORDER: distrib-dirs distribute
 .ORDER: distrib-dirs distributeworld
 .ORDER: distrib-dirs installworld
@@ -232,6 +234,8 @@ META_TGT_WHITELIST+=	build${libcompat}
 .ORDER: buildkernel installkernel.debug
 .ORDER: buildkernel reinstallkernel
 .ORDER: buildkernel reinstallkernel.debug
+.ORDER: buildkernel packages
+.ORDER: buildkernel update-packages
 .ORDER: kernel-toolchain buildkernel
 
 # Only sanitize PATH on FreeBSD.
@@ -517,6 +521,9 @@ kernels: .PHONY
 worlds: .PHONY
 	@cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildworld universe
 
+packages update-packages: .PHONY
+	${_+_}@cd ${.CURDIR}; ${_MAKE} DISTDIR=/ ${.TARGET}
+
 #
 # universe
 #