Skip to content

Merge 'tokio-1.51.2' into 'tokio-1.52.x'#8114

Merged
Darksonn merged 4 commits into
tokio-rs:tokio-1.52.xfrom
Darksonn:merge-1.51.2
May 4, 2026
Merged

Merge 'tokio-1.51.2' into 'tokio-1.52.x'#8114
Darksonn merged 4 commits into
tokio-rs:tokio-1.52.xfrom
Darksonn:merge-1.51.2

Conversation

@Darksonn
Copy link
Copy Markdown
Member

@Darksonn Darksonn commented May 4, 2026

Must be merged on the command-line with a merge commit.

*   commit f82bcf3f
|\  Merge: 7db9bc41 64834ec7
| | Author: Alice Ryhl <aliceryhl@google.com>
| | Date:   Mon May 4 12:16:30 2026 +0200
| | 
| |     Merge 'tokio-1.51.2' into 'tokio-1.52.x' (#8114)
| | 
| * commit 64834ec7 (tag: tokio-1.51.2, tokio-1.51.x)
| | Author: Alice Ryhl <aliceryhl@google.com>
| | Date:   Mon May 4 12:11:07 2026 +0200
| | 
| |     chore: prepare Tokio v1.51.2 (#8113)
| | 
| * commit 967f5715
|   Author: Alice Ryhl <aliceryhl@google.com>
|   Date:   Mon May 4 10:08:30 2026 +0200
|   
|       runtime: revert "steal tasks from the LIFO slot" (#8100)
|       
|       This reverts commit eeb55c733ba9a83c51d08b1629dca6a5ec0f4b2b.
| 
* commit 7db9bc41
| Author: Alice Ryhl <aliceryhl@google.com>
| Date:   Mon May 4 12:15:19 2026 +0200
| 
|     test: revert "remove `churn()` task from `lifo_stealable`" (#8114)
|     
|     This reverts commit 6c03e03898d71eca976ee1ad8481cf112ae722ba.
| 
* commit 9271e3ed (tokio-1.52.x)

@github-actions github-actions Bot added R-loom-current-thread Run loom current-thread tests on this PR R-loom-multi-thread Run loom multi-thread tests on this PR labels May 4, 2026
@Darksonn Darksonn added the A-tokio Area: The main tokio crate label May 4, 2026
@Darksonn Darksonn changed the title Merge 1.51.2 Merge 'tokio-1.51.2' into 'tokio-1.52.x' May 4, 2026
@Darksonn Darksonn merged commit f82bcf3 into tokio-rs:tokio-1.52.x May 4, 2026
93 of 98 checks passed
@Darksonn Darksonn deleted the merge-1.51.2 branch May 4, 2026 11:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-tokio Area: The main tokio crate R-loom-current-thread Run loom current-thread tests on this PR R-loom-multi-thread Run loom multi-thread tests on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants