Skip to content

Merge release-v0.30 branch into main #1289

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 6, 2024
Merged

Conversation

phip1611
Copy link
Member

@phip1611 phip1611 commented Aug 6, 2024

It is weird that we have a release v0.30 branch and a released version, but uefi is still
at 0.29 on the main branch. This merges the branch from #1285 into main with some necessary adaptions.

Checklist

  • Sensible git history (for example, squash "typo" or "fix" commits). See the Rewriting History guide for help.
  • Update the changelog (if necessary)

nicholasbishop and others added 6 commits August 2, 2024 11:19
The missing lifetime means that the &[u8] buffer could be freed while the
&DevicePath still exists, which is UB.

(cherry picked from commit a9e48c2)
This release contains a cherry-pick of
rust-osdev#1282.
Update transitive libs.
@phip1611
Copy link
Member Author

phip1611 commented Aug 6, 2024

Generally, I think the approach you have taken is valid. But I think, we should merge the changes into main as well. It feels more consistent and streamlined, doesn't it? @nicholasbishop

@nicholasbishop
Copy link
Member

Yep, I didn't think about the main branch but this definitely makes sense.

@nicholasbishop nicholasbishop added this pull request to the merge queue Aug 6, 2024
Merged via the queue into rust-osdev:main with commit d4ae463 Aug 6, 2024
13 checks passed
@phip1611 phip1611 deleted the foo branch August 6, 2024 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants