Fix merge conflict and updated GhsotBSD main with FreeBSD main.

.cirrus.yml

@@ -195,3 +195,32 @@ task:
   post_script:
   - df -m
   - du -m -s /usr/obj
+
+precommit_task:
+  matrix:
+    - name: amd64 smoke test using internal ci systems
+      only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*'
+      trigger_type: manual
+      env:
+        TARGET: amd64
+        TARGET_ARCH: amd64
+    - name: aarch64 smoke test using internal ci systems
+      only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*'
+      trigger_type: manual
+      env:
+        TARGET: arm64
+        TARGET_ARCH: aarch64
+  timeout_in: 120m
+
+  setup_script:
+    - uname -a
+    - gpart show
+    - df -m
+    - pkg --version
+
+  ci_script:
+    - make -C tests/ci TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} CITYPE=smoke ci
+
+  post_script:
+    - df -m
+    - du -m -s /usr/obj

.git-blame-ignore-revs

@@ -8,6 +8,8 @@
 #
 # This file is sorted in git log order (newest commits first).
 
+# iflib style tweaks
+721e783a2a3316826f92fb44c931e28163118b3f
 # queue(3) single space after all #define
 a4df0830d74dba9d20c01d8c108bddeb1ecd62cd
 # bin/ps whitespace cleanup

.github/workflows/checklist.yml

@@ -89,6 +89,7 @@ jobs:
               /* Loop for each key in "checklist". */
               for (const c in checklist)
                 msg += "- " + c + "<sup>" + checklist[c].join(", ") + "</sup>\n";
+              msg += "\nPlease review CONTRIBUTING.md, then update and push your branch again.\n"
 
               comment_func({
                 owner: context.repo.owner,

.mailmap

@@ -17,3 +17,7 @@ Val Packett <[email protected]> <[email protected]>
 Piotr Paweł Stefaniak <[email protected]> <[email protected]>
 Sumit Saxena <[email protected]> <[email protected]>
 Ganael LAPLANCHE <[email protected]> <[email protected]>
+<[email protected]> <[email protected]>
+<[email protected]> <[email protected]>
+Joyu Liao <[email protected]> <[email protected]>
+Joyu Liao <[email protected]> <[email protected]>

Makefile

@@ -103,7 +103,7 @@
 #
 # See src/UPDATING `COMMON ITEMS' for more complete information.
 #
-# If TARGET=machine (e.g. powerpc, arm64, ...) is specified you can
+# If TARGET=machine (e.g. powerpc64, arm64, ...) is specified you can
 # cross build world for other machine types using the buildworld target,
 # and once the world is built you can cross build a kernel using the
 # buildkernel target.
@@ -530,8 +530,7 @@ worlds: .PHONY
 # Don't build rarely used, semi-supported architectures unless requested.
 #
 .if defined(EXTRA_TARGETS)
-# powerpcspe excluded from main list until clang fixed
-EXTRA_ARCHES_powerpc=	powerpcspe
+EXTRA_ARCHES_powerpc=	powerpc powerpcspe
 .endif
 TARGETS?= ${TARGET_MACHINE_LIST}
 _UNIVERSE_TARGETS=	${TARGETS}
@@ -546,8 +545,7 @@ TOOLCHAINS_amd64=	amd64-${_GCC_VERSION}
 TOOLCHAINS_arm=		armv7-${_GCC_VERSION}
 TOOLCHAINS_arm64=	aarch64-${_GCC_VERSION}
 TOOLCHAINS_i386=	i386-${_GCC_VERSION}
-TOOLCHAINS_powerpc=	powerpc-${_GCC_VERSION} powerpc64-${_GCC_VERSION}
-TOOLCHAIN_powerpc64=	powerpc64-${_GCC_VERSION}
+TOOLCHAINS_powerpc=	powerpc64-${_GCC_VERSION}
 TOOLCHAINS_riscv=	riscv64-${_GCC_VERSION}
 .endif