Merge master into mlx (fails in one step, suceeds in two steps)

[gyohng]

Hi,

Just in case anyone tried merging master into the mlx branch, git merge shows a lot of mess and conflicts if just done naively as git merge master. I found that doing it in two steps works:

git merge 503174b0f394016e42f2f4208410b0c7ff21e973

and after resolving conflicts

git merge master

This will work. Immediate git merge master will show a lot of unresolvable mess.

503174b is a main branch commit from May 4, 2024

Thanks,
George.