Merge main into enzyme-dlopen, resolving conflicts

Author: sgasho

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: ["rust-lang.org/funding"]

.github/workflows/ci.yml

@@ -313,6 +313,7 @@ jobs:
     needs: [ calculate_matrix, job ]
     # !cancelled() executes the job regardless of whether the previous jobs passed or failed
     if: ${{ !cancelled() && contains(fromJSON('["auto", "try"]'), needs.calculate_matrix.outputs.run_type) }}
+    environment: ${{ ((github.repository == 'rust-lang/rust' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try' || github.ref == 'refs/heads/auto')) && 'bors') || '' }}
     steps:
       - name: checkout the source code
         uses: actions/checkout@v5

.github/workflows/ghcr.yml

@@ -55,6 +55,8 @@ jobs:
           images=(
             # Mirrored because used by the tidy job, which doesn't cache Docker images
             "ubuntu:22.04"
+            # Mirrored because used by x86-64-gnu-miri
+            "ubuntu:24.04"
             # Mirrored because used by all linux CI jobs, including tidy
             "moby/buildkit:buildx-stable-1"
             # Mirrored because used when CI is running inside a Docker container

.mailmap

@@ -43,6 +43,7 @@ Andre Bogus <[email protected]>
 Andre Bogus <[email protected]> <[email protected]>
 Andre Bogus <[email protected]> <[email protected]>
 Andrea Ciliberti <[email protected]>
+
 Andreas Gal <[email protected]> <[email protected]>
 Andreas Jonson <[email protected]>
 Andrew Gauger <[email protected]>
@@ -82,12 +83,15 @@ Ben Sago <[email protected]> <[email protected]>
 Ben Striegel <[email protected]>
 Benjamin Jackman <[email protected]>
 Benoît Cortier <[email protected]>
+binarycat <[email protected]> lolbinarycat <[email protected]> <[email protected]>
 Bheesham Persaud <[email protected]> Bheesham Persaud <[email protected]>
 bjorn3 <[email protected]> <[email protected]>
 bjorn3 <[email protected]> <[email protected]>
 Björn Steinbrink <[email protected]> <[email protected]>
 blake2-ppc <[email protected]> <blake2-ppc>
-blyxyas <[email protected]> Alejandra González <[email protected]>
+Alejandra González <[email protected]> blyxyas <[email protected]>
+Alejandra González <[email protected]> blyxyas <[email protected]>
+Alejandra González <[email protected]> Alejandra González <[email protected]>
 boolean_coercion <[email protected]>
 Boris Egorov <[email protected]> <[email protected]>
 bors <[email protected]> bors[bot] <26634292+bors[bot]@users.noreply.github.com>
@@ -427,6 +431,7 @@ Lzu Tao <[email protected]>
 Maik Klein <[email protected]>
 Maja Kądziołka <[email protected]> <[email protected]>
 Maja Kądziołka <[email protected]> <[email protected]>
+Makai <[email protected]>
 Malo Jaffré <[email protected]>
 Manish Goregaokar <[email protected]>
 Mara Bos <[email protected]>