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

v4.0.x: Fix osc sm posts when only 32 bit atomics support v4.0.x #6942

Merged

Conversation

guserav
Copy link
Contributor

@guserav guserav commented Aug 29, 2019

ref #6803

@ompiteam-bot
Copy link

Can one of the admins verify this patch?

@jsquyres
Copy link
Member

ok to test

@jsquyres jsquyres changed the title Fix osc sm posts when only 32 bit atomics support v4.0.x v4.0.x: Fix osc sm posts when only 32 bit atomics support v4.0.x Aug 29, 2019
@jsquyres jsquyres added this to the v4.0.2 milestone Aug 29, 2019
@gpaulsen
Copy link
Member

@guserav. Thanks for PRing this to v4.0.x.

Could you please re-cherry-pick this and pass -x 3c9f4e68 to git cherry-pick? This adds a comment to the git commit pointing to the master commit, which helps for auditing the release branches.

Copy link
Member

@jsquyres jsquyres left a comment

Choose a reason for hiding this comment

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

Can you please use the -x option to git cherry-pick so that it adds the (cherry picked from...) line in the commit message?

(@gpaulsen said the same thing -- I'm just turning this into a "request changes" notation)

Signed-off-by: guserav <erik.zeiske@hpe.com>
(cherry picked from commit 3c9f4e6)
@guserav guserav force-pushed the v4-fix-osc-sm-post-32-bit-atomics branch from 69a25c3 to 9bf1873 Compare August 31, 2019 19:32
Copy link
Member

@jsquyres jsquyres left a comment

Choose a reason for hiding this comment

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

Thanks!

@hppritcha hppritcha merged commit 6912e09 into open-mpi:v4.0.x Sep 3, 2019
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.

5 participants