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

Refactor criu plugin baseline v1 #2295

Open
wants to merge 3 commits into
base: criu-dev
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/amdgpu/amdgpu_plugin_topology.c
Original file line number Diff line number Diff line change
Expand Up @@ -1244,7 +1244,7 @@ static bool map_devices(struct tp_system *src_sys, struct tp_system *dest_sys, s
return true;
} else {
/* We could not map remaining nodes in the list. Add dest node back
* to list and try to map next dest ndoe in list to current src
* to list and try to map next dest node in list to current src
Copy link
Member

Choose a reason for hiding this comment

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

Would you be able to apply this change in the previous commit (using git rebase or git commit --amend)?
https://github.com/checkpoint-restore/criu/blob/criu-dev/CONTRIBUTING.md#pull-request-guidelines

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for pointing out the procedure to look at the details.
I am rather new to submitting to repo on github that goes through an approval.
I was getting an error when I fixed the error (typo) locally and tried to push it again.
The git pull was messing up my local repo branch and thus the commit online on github itself

Copy link
Member

Choose a reason for hiding this comment

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

After modifying the commit you might need to use git push with -f to update your github branch.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Given my headaches, will push a new branch which will contain resolution to the various comments.

* node.
*/
pr_debug("Nodes after [0x%04X -> 0x%04X] did not match, "
Expand Down
Loading