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

Revert "Cherry pick commit for kfunc support" #227

Merged
merged 1 commit into from
Aug 8, 2023
Merged

Revert "Cherry pick commit for kfunc support" #227

merged 1 commit into from
Aug 8, 2023

Conversation

aditighag
Copy link
Member

Alas, we are finally hitting merge conflicts.

CONFLICT (content): Merge conflict in llvm/lib/Target/BPF/BTFDebug.cpp
warning: inexact rename detection was skipped due to too many files. 
warning: you may want to set your merge.renamelimit variable to at least 20590 and retry the command.
error: could not apply 886f9ff53155... BPF: add extern func to data sections if specified

I've started an internal thread to discuss the conflicts.

@aditighag aditighag requested a review from a team as a code owner August 7, 2023 23:07
@aditighag aditighag requested review from rgo3 and a team August 7, 2023 23:07
@aanm aanm merged commit bbb3754 into master Aug 8, 2023
1 check passed
@aanm aanm deleted the revert-cherry-pick branch August 8, 2023 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rgo3 rgo3 rgo3 approved these changes

@ldelossa ldelossa ldelossa approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@aditighag @ldelossa @rgo3 @aanm