search

rust-osdev / x86_64

Library to program x86_64 hardware.
https://docs.rs/x86_64
Apache License 2.0
797 stars 132 forks source link

Update `next` branch with latest changes from `master` #447

Closed phil-opp closed 10 months ago

phil-opp commented 10 months ago

Update next branch with latest changes from master, using the conflict resolution from #446.

This PR allows us to apply more changes to the next branch before release v0.15. In particular, we plan to merge a change to make the GDT const generic before the release.

phil-opp commented 10 months ago

Closing, no longer needed.

Freax13 commented 10 months ago

How can I review this? Is there a way to see conflict resolution changes of the merge or rebase from master into next or we're all of those already handled in #446?

phil-opp commented 10 months ago

This was just a fast-forward merge. So this updates the branch to commit f5c2b06, which is part of #446 (before the changelog updates). You can just do a git diff or git log, there should not be any differences.

Freax13 commented 10 months ago

Ah, ok that makes sense, thanks!

I just fast-forwarded a few more commits from #446 including the version bump commit, so CI (and the semver check in particular) passes.