Skip to content
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

Runtime cherry picks: upstream trunk -> 5.2 #2942

Merged

Conversation

mshinwell
Copy link
Collaborator

These correspond to the list here:
https://github.com/ocaml-flambda/flambda-backend/wiki/Post%E2%80%905.2-changesets-from-trunk-to-backport-to-5.2.0minus

I think the only significant change to any of these is the flambda2 support for Sys.poll_actions, but it is straightforward.

This PR is based on #2941.

@mshinwell mshinwell requested a review from stedolan August 19, 2024 13:01
@mshinwell mshinwell changed the title 5.2 trunk runtime cherry picks Runtime cherry picks: upstream trunk -> 5.2 Aug 19, 2024
@stedolan
Copy link
Contributor

Could you explain exactly which PRs / patches are in this? It doesn't seem to match the list in the linked wiki page.

For instance, 13299 is listed in "To backport" but not present here, and 12839 is listed in "To skip" and is present here (at least partially).

@mshinwell mshinwell force-pushed the 5.2-trunk-runtime-cherry-picks branch 2 times, most recently from 4a26ea3 to 1d5f32f Compare August 19, 2024 13:46
@mshinwell
Copy link
Collaborator Author

(have discussed with @stedolan separately)

PR13063 was added because it's a dependency of some of the others.

@mshinwell mshinwell force-pushed the 5.2-trunk-runtime-cherry-picks branch from 1d5f32f to 0e0185e Compare August 19, 2024 13:57
Copy link
Contributor

@stedolan stedolan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs a rebase now that 2941 is merged but lgtm

…ap handlers.): upstream 8a3dc3d

(cherry picked from commit 429f698)
@mshinwell mshinwell force-pushed the 5.2-trunk-runtime-cherry-picks branch from 0e0185e to 7c77137 Compare August 19, 2024 16:51
@mshinwell mshinwell merged commit 7c77137 into ocaml-flambda:merge-5.2 Aug 19, 2024
1 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants