Skip to content

Conversation

@liam923
Copy link
Contributor

@liam923 liam923 commented Sep 16, 2025

The first 4 commits (up through 34a88ad) are the result of running the import script and can be skipped. The 5th commit (602224c) can also be skipped if desired - it contains fairly straightforward conflict resolution, but a second set of eyes wouldn't hurt.

Commits 81ee013 and 944ecfe should also be skipped - those are automatic merges due to a compiler retag.

Of the remaining commits, I'd like additional review from a couple people:

@github-actions
Copy link

github-actions bot commented Sep 16, 2025

Compiler Merge Checklist

This PR seems to merge changes from Flambda. Please be sure to follow the below steps:

  • Update the magic numbers
  • Update list of compiler flags to ignore
  • Make Merlin know about new relevant compiler flags

If this PR is not merging changes from Flambda, feel free to ignore this comment

@liam923 liam923 force-pushed the merge-5.2.0minus-19 branch from ce0e363 to 97c7dad Compare September 17, 2025 15:37
Copy link

@spiessimon spiessimon left a comment

Choose a reason for hiding this comment

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

The shape related changes look good to me!

@liam923 liam923 merged commit 77688cb into main Sep 17, 2025
2 checks passed
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.

4 participants