Merge branch '5.x' into mergify/bp/5.x/pr-3775

.github/mergify/gen-config.sc

@@ -25,7 +25,9 @@ import io.circe.yaml.syntax._ // for .asYaml
 
 def mergeQueue(conditions: List[String]) = Json.obj(
   "name" -> "default".asJson,
-  "conditions" -> conditions.asJson
+  "conditions" -> conditions.asJson,
+  "update_bot_account" -> "chiselbot".asJson,
+  "merge_bot_account" -> "chiselbot".asJson
 )
 
 val queueAction = Json.obj(

.mergify.yml

@@ -2,6 +2,8 @@ queue_rules:
 - name: default
   conditions:
   - status-success=all tests passed
+  update_bot_account: chiselbot
+  merge_bot_account: chiselbot
 pull_request_rules:
 - name: automatic squash-and-merge on CI success and review
   conditions:

CONTRIBUTING.md

@@ -12,7 +12,7 @@
 
 5. You can peruse the [good-first-issues](https://github.com/chipsalliance/chisel3/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) for easy tasks to start with. Another easy thing to start with is doing your own pass of the [website](https://www.chisel-lang.org/chisel3/docs/introduction.html) looking for typos, pages missing their titles, etc. The sources for the website are [here](https://github.com/chipsalliance/chisel3/tree/master/docs).
 
-6. Please make your PRs against the `master` branch. The project admins, when reviewing your PR, will decide which stable version (if any) your change should be backported to. The backports will be opened automatically on your behalf once your `master` PR is merged.
+6. Please make your PRs against the `main` branch. The project admins, when reviewing your PR, will decide which stable version (if any) your change should be backported to. They will apply the appropriate `milestone` marker which controls which branches the backport will be opened to. The backports will be opened automatically on your behalf once your `main` PR is merged.
 
 7. The PR template will require you to select "Type of Improvement." A reviewer or someone with write access will add the appropriate label to your PR based on this type of improvement which will include your PR in the correct category in the release notes.