Merge remote-tracking branch 'freebsd/main'

Author: ericbsd

.cirrus.yml

@@ -10,7 +10,7 @@ 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-3-release-amd64-ufs
+  image: freebsd-15-0-release-amd64-ufs
   cpu: 8
   memory: 8G
   disk: 40
@@ -197,16 +197,17 @@ task:
   - du -m -s /usr/obj
 
 precommit_task:
+  persistent_worker:
+    labels:
+      jail: FreeBSD-src
   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

.github/path-rules.txt

@@ -0,0 +1,10 @@
+#
+# Format the similar to CODEOWNERS: Each line has a path, whitespace and a
+# message for contributors.
+#
+sys/contrib/device-tree	:caution: No changes should be made here by pull request
+# Catch all
+contrib		:warning: Contributed software usually managed by vendor branch
+crypto		:warning: Contributed crypto software usually managed by vendor branch
+sys/contrib	:warning: Contributed software usually managed by vendor branch
+sys/crypto/skein	:warning: Contributed crypto software usually managed by vendor branch

.github/workflows/checklist.yml

@@ -13,6 +13,7 @@ permissions:
 jobs:
   checklist:
     name: commit
+    if: github.repository == 'freebsd/freebsd-src'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/github-script@v7
@@ -36,11 +37,49 @@ jobs:
               pull_number: context.issue.number
             });
 
+            /* Get owners */
+
+            let owners = [];
+            const { data: ownerData } = await github.rest.repos.getContent({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              path: '.github/CODEOWNERS',
+              ref: context.payload.pull_request.base.ref // Or a specific branch
+            });
+            const oc = Buffer.from(ownerData.content, 'base64').toString();
+            owners = oc.split(/\r?\n/)
+              .map(line => line.trim())
+              // Filter out comments and empty lines
+              .filter(line => line && !line.startsWith('#'))
+              .map(line => {
+                // Split by the first block of whitespace to separate path and message
+                 const [path, ...ownerParts] = line.substring(1).split(/\s+/);
+                 return { path, owner: ownerParts.join(' ') };
+            });
+
+            /* Get rules -- maybe refactor to a function for ownerPath too */
+            let rules = [];
+            const { data: rulesData } = await github.rest.repos.getContent({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              path: '.github/path-rules.txt',
+              ref: context.payload.pull_request.base.ref // Or a specific branch
+            });
+            const rc = Buffer.from(rulesData.content, 'base64').toString();
+            rules = rc.split(/\r?\n/)
+              .map(line => line.trim())
+              // Filter out comments and empty lines
+              .filter(line => line && !line.startsWith('#'))
+              .map(line => {
+                // Split by the first block of whitespace to separate path and message
+                const [path, ...messageParts] = line.split(/\s+/);
+                return { path, message: messageParts.join(' ') };
+            });
+
             let checklist = {};
             let checklist_len = 0;
             let comment_id = -1;
 
-            const msg_prefix = "Thank you for taking the time to contribute to FreeBSD!\n";
             const addToChecklist = (msg, sha) => {
               if (!checklist[msg]) {
                 checklist[msg] = [];
@@ -72,6 +111,43 @@ jobs:
                 addToChecklist("Real email address is needed", commit.sha);
             }
 
+            /* Check for different paths that have issues and/or owners */
+            const { data: files } = await github.rest.pulls.listFiles({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.payload.pull_request.number,
+            });
+
+            let infolist = {};
+            let infolist_len = 0;
+            const addToInfolist = (msg) => {
+              if (!infolist[msg]) {
+                infolist[msg] = [];
+                infolist_len++;
+              }
+            }
+
+            /* Give advice based on what's in the commit */
+            for (const file of files) {
+              for (const owner of owners) {
+                if (file.filename.startsWith(owner.path)) {
+                  addToInfolist("> [!IMPORTANT]\n> " + owner.owner + " wants to review changes to " + owner.path + "\n");
+                }
+              }
+              for (const rule of rules) {
+                // Consider regexp in the future maybe?
+                if (file.filename.startsWith(rule.path)) {
+                  if (rule.message.startsWith(":caution: ")) {
+                    addToInfolist("> [!CAUTION]\n> " + rule.path + ": " + rule.message.substring(10) + "\n");
+                  } else if (rule.message.startsWith(":warning: ")) {
+                    addToInfolist("> [!WARNING]\n> " + rule.path + ": " + rule.message.substring(10) + "\n");
+                  } else {
+                    addToInfolist("> [!IMPORTANT]\n> " + rule.path + ": " + rule.message + "\n");
+                  }
+                }
+              }
+            }
+
             /* Check if we've commented before. */
             for (const comment of comments) {
               if (comment.user.login == "github-actions[bot]") {
@@ -80,17 +156,28 @@ jobs:
               }
             }
 
-            if (checklist_len != 0) {
-              let msg = msg_prefix +
-                "There " + (checklist_len > 1 ? "are a few issues that need " : "is an issue that needs ") +
-                "to be fixed:\n";
+            const msg_prefix = "Thank you for taking the time to contribute to FreeBSD!\n\n";
+            if (checklist_len != 0 || infolist_len != 0) {
+              let msg = msg_prefix;
               let comment_func = comment_id == -1 ? github.rest.issues.createComment : github.rest.issues.updateComment;
+              if (checklist_len != 0) {
+                msg +=
+                  "There " + (checklist_len > 1 ? "are a few issues that need " : "is an issue that needs ") +
+                  "to be resolved:\n";
 
-              /* Loop for each key in "checklist". */
-              for (const c in checklist)
-                msg += "- " + c + "<sup>" + checklist[c].join(", ") + "</sup>\n";
-              msg += "\nPlease review [CONTRIBUTING.md](https://github.com/freebsd/freebsd-src/blob/main/CONTRIBUTING.md), then update and push your branch again.\n"
-
+                /* Loop for each key in "checklist". */
+                for (const c in checklist)
+                  msg += "- " + c + " (" + checklist[c].join(", ") + ")\n";
+                msg += "\n> [!NOTE]\n> Please review [CONTRIBUTING.md](https://github.com/freebsd/freebsd-src/blob/main/CONTRIBUTING.md), then update and push your branch again.\n\n"
+              } else {
+                let msg = "No Issues found.\n\n";
+              }
+              if (infolist_len != 0) {
+                msg += "Some of files have special handling:\n"
+                for (const i in infolist)
+                  msg += i + "\n";
+                msg += "\n\n";
+              }
               comment_func({
                 owner: context.repo.owner,
                 repo: context.repo.repo,

.mailmap

@@ -22,3 +22,7 @@ Ganael LAPLANCHE <martymac@FreeBSD.org> <ganael.laplanche@martymac.org>
 <ivy@FreeBSD.org> <lexi@hemlock.eden.le-fay.org>
 Joyu Liao <joyul@juniper.net> <joyul@juniper.netnull>
 Joyu Liao <joyul@juniper.net> <joyul@juniper.net>
+<tpearson@FreeBSD.org> <tpearson@raptorengineering.com>
+Pouria Mousavizadeh Tehrani <pouria@FreeBSD.org> <p.mousavizadeh@protonmail.com>
+Pouria Mousavizadeh Tehrani <pouria@FreeBSD.org> <info@spmzt.net>
+Siva Mahadevan <siva@FreeBSD.org> <me@svmhdvn.name>

CONTRIBUTING.md

@@ -39,19 +39,19 @@ A pull request will be considered if:
 * You can respond to feedback quickly. If feedback is requested and one month passes without a response we may close the pull request.
 * It touches fewer than about 10 files and the changes are less than about 200 lines. Changes larger than this may be OK, or you may be asked to submit multiple pull requests of a more manageable size.
 * Each logical change is a separate commit within the pull request. Commit messages for each change should follow the [commit log message guide](https://docs.freebsd.org/en/articles/committers-guide/#commit-log-message).
-* All commits have, as the author, your name and valid email address as you would like to see them in the FreeBSD repository. Fake github.com addresses cannot be used. But see [Author Name and Email][#author-name-and-email] for details.
+* All commits have, as the git author, your name and valid email address as you would like to see them in the FreeBSD repository. Fake github.com addresses cannot be used. But see [Author Name and Email][#author-name-and-email] for details.
 * The scope of the pull request should not change during review. If the review suggests changes that expand the scope, please create an independent pull request.
 * Fixup commits should be squashed with the commit they are fixing. Each commit in your branch should be suitable for FreeBSD's repository.
-* Commits should include one or more `Signed-off-by:` lines with name and email address certifying [Developer Certificate of Origin](https://developercertificate.org/). But see [Author Name and Email][#author-name-and-email] for details.
+* Commit messages should include one or more `Signed-off-by:` trailer lines with name and email address certifying [Developer Certificate of Origin](https://developercertificate.org/). But see [Author Name and Email][#author-name-and-email] for details.
 * The commits follow FreeBSD's style guide. See [Style](#Style).
-* Run tools/build/checkstyle9.pl on your Git branch and eliminate all errors, or provide an explanation for exceptions.
+* Run tools/build/checkstyle9.pl on your Git branch and eliminate all errors, or provide an explanation for exceptions. The tool sometimes makes mistakes, and providing an explanation shows you have examined the output.
 * The commits do not introduce trailing white space.
 * If the commit fixes a bug, please add 'PR: \<bugnumber\>' to the commit message to document the Bugzilla Problem Report number.
 * If there's a code review related to this change, please include its URL in the commit message. However, where possible, please do not open both a differential review and a GitHub pull request.
 * If you have run FreeBSD's sources through a static analysis tool, please don't submit the raw results. Please also see the chunking up guidelines. Also, please make sure that kyua tests are the same before / after your change. Ideally, you'd also create a test case that shows an actual bug that's being fixed by these changes.
 * FreeBSD committers submitting pull requests are responsible for pushing them into the tree (possibly with approval if cross-repo commit bit policy needs it). Pull requests by FreeBSD committers will be closed after a month unless there's a very good reason not to.
-* Submissions using generative AI will be rejected.
-* Submissions from AI chatbots will result in the account being banned.
+* Low quality submimssions will be rejected, especially if they were generated by AI with little to no refinement.
+* Submissions by AI chatbots will result in the account being banned. Do not use pull requests interaction to train your LLM or similar AI model.
 
 When revising your pull request after feedback, please rebase with a forced push
 rather than a merge commit.

COPYRIGHT

@@ -2,7 +2,7 @@
 The compilation of software known as FreeBSD is distributed under the
 following terms:
 
-Copyright (c) 1992-2025 The FreeBSD Project.
+Copyright (c) 1992-2026 The FreeBSD Project.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions