Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

CPI support for bpf_loader_deprecated (bp #11695) #11824

Merged
merged 2 commits into from
Aug 25, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 25, 2020

This is an automated backport of pull request #11695 done by Mergify

Cherry-pick of 4683012 has failed:

On branch mergify/bp/v1.3/pr-11695
Your branch is up to date with 'origin/v1.3'.

You are currently cherry-picking commit 46830124f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   programs/bpf_loader/src/syscalls.rs

no changes added to commit (use "git add" and/or "git commit -a")

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the simulator.

Finally, you can contact us on https://mergify.io/

(cherry picked from commit 4683012)

# Conflicts:
#	programs/bpf_loader/src/syscalls.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Aug 25, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Aug 25, 2020

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Aug 25, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 25, 2020
@codecov
Copy link

codecov bot commented Aug 25, 2020

Codecov Report

Merging #11824 into v1.3 will decrease coverage by 0.0%.
The diff coverage is 0.0%.

@@           Coverage Diff            @@
##            v1.3   #11824     +/-   ##
========================================
- Coverage   82.2%    82.1%   -0.1%     
========================================
  Files        331      331             
  Lines      77372    77373      +1     
========================================
- Hits       63608    63579     -29     
- Misses     13764    13794     +30     

@mergify mergify bot merged commit ad36dde into v1.3 Aug 25, 2020
@mergify mergify bot deleted the mergify/bp/v1.3/pr-11695 branch August 25, 2020 11:02
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant