Skip to content

Conversation

@luzpaz
Copy link
Contributor

@luzpaz luzpaz commented Aug 14, 2022

Found via codespell -q 3 -S ./3rd-party,./docs/news -L bloc,chello,childs,connexion,fo,improbe,inout,iput,mmaped,msdos,ro,scoll,sentinal,siz,upto,warmup

@ompiteam-bot
Copy link

Can one of the admins verify this patch?

luzpaz added 2 commits August 15, 2022 15:30
Found via `codespell -q 3 -S ./3rd-party,./docs/news -L bloc,chello,childs,connexion,fo,improbe,inout,iput,mmaped,msdos,ro,scoll,sentinal,siz,upto,warmup`

Signed-off-by: luz paz <luzpaz@github.com>
Signed-off-by: luz paz <luzpaz@github.com>
@jsquyres
Copy link
Member

ok to test

@jsquyres
Copy link
Member

bot:aws:retest

1 similar comment
@jsquyres
Copy link
Member

bot:aws:retest

@jsquyres jsquyres merged commit f649dd4 into open-mpi:main Aug 16, 2022
@jsquyres
Copy link
Member

@awlauria @gpaulsen @janjust FYI: I just tried to cherry-pick these commits to v5.0.x and ran into conflicts. The conflicts are all easy enough to resolve, but it means that there are commits that are on main that have not come over to v5.0.x.

Is this already known? I.e., are there some things on main that are intentionally not on v5.0.x? More specifically: is it worth using the attempt to cherry pick the 2 commits on this PR to v5.0.x to find other commits that haven't already been cherry picked to v5.0.x?

@awlauria
Copy link
Contributor

@jsquyres before the next rc I'll do an audit to see what's missing, but you are welcome to check now if you want.

To my knowledge main and v5.0.x should be kept relatively in sync, but of course there's a lag in some cases. There's nothing on main currently that shouldn't be in 5 that I am aware of.

@jsquyres
Copy link
Member

jsquyres commented Aug 16, 2022

FWIW, as of v5.0.x 78d3d9d (i.e., after your v5.0.x merges from this morning), I still get a bunch of conflicts when I try to cherry pick these commits.

@luzpaz luzpaz deleted the typos/remaining branch August 16, 2022 17:51
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.

4 participants