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

Gate pointer alignment enforcement (bp #12176) #12188

Merged
merged 2 commits into from
Sep 12, 2020
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 11, 2020

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

Cherry-pick of ae7b15f has failed:

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

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

Changes to be committed:

	modified:   programs/bpf/benches/bpf_loader.rs
	modified:   programs/bpf_loader/src/lib.rs
	modified:   programs/bpf_loader/src/syscalls.rs

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

	both modified:   programs/bpf/tests/programs.rs

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 ae7b15f)

# Conflicts:
#	programs/bpf/tests/programs.rs
@mergify mergify bot added the conflicts label Sep 11, 2020
@t-nelson
Copy link
Contributor

@jackcmay 👋

@jackcmay
Copy link
Contributor

Is clapping your new thing? ;-)

@t-nelson
Copy link
Contributor

It's a 🌊, sir! 🙂

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

codecov bot commented Sep 12, 2020

Codecov Report

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

@@           Coverage Diff            @@
##            v1.3   #12188     +/-   ##
========================================
- Coverage   82.2%    82.1%   -0.1%     
========================================
  Files        337      337             
  Lines      79564    79631     +67     
========================================
+ Hits       65430    65455     +25     
- Misses     14134    14176     +42     

@mergify mergify bot merged commit 8dc019a into v1.3 Sep 12, 2020
@mergify mergify bot deleted the mergify/bp/v1.3/pr-12176 branch September 12, 2020 00:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants