Skip to content

Include missing item in the 1.81 release notes #135934

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Jan 26, 2025

Conversation

pietroalbini
Copy link
Member

It was pointed out to me that when I prepared the CVE-2024-43402 fix in the stable branch, I added the release notes in the stable PR (#129960), but I forgot to do so in the beta or nightly PR. Because of that, the relnotes line only appeared in 1.81, and disappeared afterwards.

@rustbot
Copy link
Collaborator

rustbot commented Jan 23, 2025

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Jan 23, 2025
bors-ferrocene bot added a commit to ferrocene/ferrocene that referenced this pull request Jan 24, 2025
1245: [1.83] Backport KP docs, release notes fix r=pietroalbini a=Hoverbear

Backports

* #1244 

Also backports rust-lang/rust@24906b5 which which upstream is also doing: rust-lang/rust#135934

In the case of 24906b5, this is somewhat of a special circumstance. We noticed during our own release process that our 1.81 (so 24.11) release notes had changed and this change (along with rust-lang/rust#126967 which was removed with rust-lang/rust#129995) had disappeared. We confirmed the fix for rust-lang/rust#129960 is indeed in tree, but upstream never ported the release note update to their main branch. This port is being done in rust-lang/rust#135934.



Co-authored-by: Pietro Albini <pietro.albini@ferrous-systems.com>
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 25, 2025

📌 Commit 9ce6741 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 25, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 26, 2025
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#134300 (remove long-deprecated no-op attributes no_start and crate_id)
 - rust-lang#134373 (Improve and expand documentation of pipes)
 - rust-lang#135934 (Include missing item in the 1.81 release notes)
 - rust-lang#136005 (ports last few library files to new intrinsic style)
 - rust-lang#136016 (Improve check-cfg expected names diagnostic)
 - rust-lang#136039 (docs: fix typo in std::pin overview)
 - rust-lang#136056 (Fix typo in const stability error message)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f421636 into rust-lang:master Jan 26, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 26, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 26, 2025
Rollup merge of rust-lang#135934 - ferrocene:pa-1.81-relnotes, r=Mark-Simulacrum

Include missing item in the 1.81 release notes

It was pointed out to me that when I prepared the CVE-2024-43402 fix in the stable branch, I added the release notes in the stable PR (rust-lang#129960), but I forgot to do so in the beta or nightly PR. Because of that, the relnotes line only appeared in 1.81, and disappeared afterwards.
@pietroalbini pietroalbini deleted the pa-1.81-relnotes branch March 24, 2025 09:59
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants