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.

Sign up for GitHub

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

Jump to bottom

DLPX-88574 merge conflict in drgn repository #57

Merged
merged 5 commits into from
Oct 31, 2023
Merged

DLPX-88574 merge conflict in drgn repository #57

merged 5 commits into from
Oct 31, 2023

Conversation

prakashsurya
Copy link

@prakashsurya prakashsurya commented Oct 31, 2023 •
edited
Loading

Merge conflict due us removing a file.. i.e.

> g merge origin/upstreams/develop
CONFLICT (modify/delete): .pre-commit-config.yaml deleted in HEAD and modified in origin/upstreams/develop.  Version origin/upstreams/develop of .pre-commit-config.yaml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

Resolved it by git-rm-ing the file:

> g rm .pre-commit-config.yaml
rm '.pre-commit-config.yaml'

osandov and others added 5 commits October 30, 2023 12:41
@osandov
pre-commit: update Black, flake8, and pre-commit-hooks
31fd062 
No changes required.

Signed-off-by: Omar Sandoval <[email protected]>
@osandov
drgn.helpers.linux: add maple tree helpers
e4100db 
Maple trees have been around and used for VMAs for almost a year now
(since Linux 6.1). Finally add helpers and tests for them.

Closes osandov#261.

Signed-off-by: Omar Sandoval <[email protected]>
@osandov
drgn.helpers.linux.mm: add for_each_vma() helper
eab64bd 
This takes care of the transition from the VMA linked list to maple
trees for users.

Signed-off-by: Omar Sandoval <[email protected]>
@osandov
contrib/vmmap.py: use new for_each_vma() helper
cf0b754 
Signed-off-by: Omar Sandoval <[email protected]>
Merge remote-tracking branch 'origin/upstreams/develop' into develop
13f93e0 
PR URL: https://www.github.com/delphix/drgn/pull/57
@prakashsurya prakashsurya force-pushed the dlpx/pr/prakashsurya/ea3c6dce-f067-46a8-89ed-9a316aa3ad81 branch from 6152777 to 13f93e0 Compare October 31, 2023 18:03
@prakashsurya prakashsurya marked this pull request as ready for review October 31, 2023 18:04
@prakashsurya prakashsurya changed the title Merge remote-tracking branch 'origin/upstreams/develop' into develop DLPX-88574 merge conflict in drgn repository Oct 31, 2023
@prakashsurya prakashsurya changed the title DLPX-88574 merge conflict in drgn repository DLPX-88574 merge conflict in drgn repository Oct 31, 2023
@prakashsurya prakashsurya changed the title DLPX-88574 merge conflict in drgn repository DLPX-88574 merge conflict in drgn repository Oct 31, 2023
@prakashsurya prakashsurya merged commit 13f93e0 into develop Oct 31, 2023
4 of 10 checks passed
@prakashsurya prakashsurya deleted the dlpx/pr/prakashsurya/ea3c6dce-f067-46a8-89ed-9a316aa3ad81 branch October 31, 2023 20:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sumedhbala-delphix sumedhbala-delphix sumedhbala-delphix approved these changes

@sebroy sebroy sebroy approved these changes

@grwilson grwilson Awaiting requested review from grwilson

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@prakashsurya @sebroy @sumedhbala-delphix @osandov