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

Bump rbpf to v0.2.19 (backport #21880) #21891

Merged
merged 1 commit into from
Dec 14, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 14, 2021

This is an automatic backport of pull request #21880 done by Mergify.
Cherry-pick of 509bcd2 has failed:

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

You are currently cherry-picking commit 509bcd2e7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Cargo.lock
	modified:   programs/bpf/Cargo.lock
	modified:   programs/bpf/benches/bpf_loader.rs
	modified:   programs/bpf/tests/programs.rs
	modified:   programs/bpf_loader/src/lib.rs
	modified:   rbpf-cli/src/main.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cli/Cargo.toml
	both modified:   programs/bpf/Cargo.toml
	both modified:   programs/bpf_loader/Cargo.toml
	both modified:   rbpf-cli/Cargo.toml
	both modified:   sdk/src/feature_set.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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 config editor.

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

@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Dec 14, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Dec 14, 2021

automerge label removed due to a CI failure

* Bump rbpf to v0.2.19

Co-authored-by: Alexander Meißner <[email protected]>
(cherry picked from commit 509bcd2)
@Lichtso Lichtso force-pushed the mergify/bp/v1.9/pr-21880 branch from 51bff37 to d793c45 Compare December 14, 2021 17:15
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Dec 14, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Dec 14, 2021

automerge label removed due to a CI failure

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Dec 14, 2021
@codecov
Copy link

codecov bot commented Dec 14, 2021

Codecov Report

Merging #21891 (d793c45) into v1.9 (3977bcd) will decrease coverage by 0.0%.
The diff coverage is 75.0%.

@@            Coverage Diff            @@
##             v1.9   #21891     +/-   ##
=========================================
- Coverage    81.2%    81.2%   -0.1%     
=========================================
  Files         515      515             
  Lines      143644   143646      +2     
=========================================
+ Hits       116777   116778      +1     
- Misses      26867    26868      +1     

@mergify mergify bot merged commit 2cd2f3b into v1.9 Dec 14, 2021
@mergify mergify bot deleted the mergify/bp/v1.9/pr-21880 branch December 14, 2021 20:31
@brooksprumo brooksprumo mentioned this pull request Jan 5, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Apr 4, 2022

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 4, 2022
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 locked PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant