Skip to content

Conversation

@paklui
Copy link
Contributor

@paklui paklui commented Nov 17, 2020

to fix #8221 for v4.1.x
cherry picked from 3cdead0

Signed-off-by: Pak Lui pak.lui@amd.com

@ompiteam-bot
Copy link

Can one of the admins verify this patch?

@jsquyres jsquyres added this to the v4.1.0 milestone Nov 17, 2020
@jsquyres
Copy link
Member

@paklui Can you add the "cherry picked" line to show where this commit came from? git cherry-pick -x ... will automatically add that line to the commit message.

Thanks!

@jsquyres jsquyres changed the title oshmem/tools/oshmem_info: fix fortran keyword issue when compiling param.c v4.1.x: oshmem/tools/oshmem_info: fix fortran keyword issue when compiling param.c Nov 17, 2020
@paklui
Copy link
Contributor Author

paklui commented Nov 17, 2020

@jsquyres ok, I ran into the git cherry-pick -x command so I ended up doing manually instead.

@jsquyres
Copy link
Member

Can you update the git commit message itself? Not the github PR description.

Thanks!

@paklui
Copy link
Contributor Author

paklui commented Nov 17, 2020

@jsquyres OK, I modified the commit messages for v4.0.x and v4.1.x

@jsquyres
Copy link
Member

It looks like you added another commit with non-standard formatting in the message and then a merge commit after that.

I was just looking for a single commit with the signed-off-line and the cherry-picked line in the commit message. 😄

Let me see if I can fix up the PR for you...

@jsquyres
Copy link
Member

Bah; I goofed and pushed the wrong thing, which then resulted in Github closing this PR and removing the edit perms on @paklui's branch. So I opened #8228 with the v4.1.x fix.

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.

3 participants