about summary refs log tree commit diff
path: root/src/ci
diff options
context:
space:
mode:
authorThe Miri Cronjob Bot <miri@cron.bot>2025-09-11 05:01:01 +0000
committerThe Miri Cronjob Bot <miri@cron.bot>2025-09-11 05:01:01 +0000
commit3790e37ca2a70fc6a3b6f87b24fccc1b595c142d (patch)
tree9934703d95219b9a4c1e07580e3e20c3395f669d /src/ci
parent68bff8cb9db58d7006f609971e6961646b44dbe9 (diff)
parent1a1510816a69844fb3611efdc53acee07a55cebb (diff)
downloadrust-3790e37ca2a70fc6a3b6f87b24fccc1b595c142d.tar.gz
rust-3790e37ca2a70fc6a3b6f87b24fccc1b595c142d.zip
Merge ref 'f4665ab8368a' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: f4665ab8368ad2e8a86d4390ae35c28bdd9561bb
Filtered ref: d2e3c00d12fb613c03777e620c50528112247ad2
Upstream diff: https://github.com/rust-lang/rust/compare/a09fbe2c8372643a27a8082236120f95ed4e6bba...f4665ab8368ad2e8a86d4390ae35c28bdd9561bb

This merge was created using https://github.com/rust-lang/josh-sync.
Diffstat (limited to 'src/ci')
-rwxr-xr-xsrc/ci/docker/scripts/rfl-build.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/ci/docker/scripts/rfl-build.sh b/src/ci/docker/scripts/rfl-build.sh
index 7e0fb5794f4..b7d7151b171 100755
--- a/src/ci/docker/scripts/rfl-build.sh
+++ b/src/ci/docker/scripts/rfl-build.sh
@@ -2,9 +2,7 @@
 
 set -euo pipefail
 
-# https://github.com/rust-lang/rust/pull/144443
-# https://github.com/rust-lang/rust/pull/145928
-LINUX_VERSION=8851e27d2cb947ea8bbbe8e812068f7bf5cbd00b
+LINUX_VERSION=v6.17-rc5
 
 # Build rustc, rustdoc, cargo, clippy-driver and rustfmt
 ../x.py build --stage 2 library rustdoc clippy rustfmt