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

Align host addresses (bp #11384) #11817

Merged
merged 3 commits into from
Aug 25, 2020
Merged

Align host addresses (bp #11384) #11817

merged 3 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 #11384 done by Mergify

Cherry-pick of 9290e56 has failed:

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

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

Changes to be committed:

	modified:   local-cluster/tests/local_cluster.rs
	modified:   programs/bpf/c/src/invoked/invoked.c
	new file:   programs/bpf_loader/src/serialization.rs
	modified:   programs/bpf_loader/src/syscalls.rs
	new file:   programs/bpf_loader/test_elfs/noop_aligned.so
	renamed:    programs/bpf_loader/test_elfs/noop.so -> programs/bpf_loader/test_elfs/noop_unaligned.so
	modified:   sdk/bpf/c/inc/solana_sdk.h
	modified:   sdk/src/bpf_loader.rs
	new file:   sdk/src/bpf_loader_deprecated.rs
	modified:   sdk/src/entrypoint.rs

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

	both modified:   core/src/validator.rs
	both modified:   genesis-programs/src/lib.rs
	both added:      programs/bpf_loader/src/deprecated.rs
	both modified:   programs/bpf_loader/src/lib.rs
	both modified:   sdk/src/entrypoint_native.rs
	both modified:   sdk/src/lib.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/

* Align host addresses

* support new program abi

* update epoch rollout

* Enforce aligned pointers in cross-program invocations

(cherry picked from commit 9290e56)

# Conflicts:
#	core/src/validator.rs
#	genesis-programs/src/lib.rs
#	programs/bpf_loader/src/deprecated.rs
#	programs/bpf_loader/src/lib.rs
#	sdk/src/entrypoint_native.rs
#	sdk/src/lib.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 automerge Merge this Pull Request automatically once CI passes and removed 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 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 #11817 into v1.3 will increase coverage by 0.1%.
The diff coverage is 97.0%.

@@           Coverage Diff            @@
##            v1.3   #11817     +/-   ##
========================================
+ Coverage   82.0%    82.2%   +0.1%     
========================================
  Files        329      331      +2     
  Lines      77124    77372    +248     
========================================
+ Hits       63313    63601    +288     
+ Misses     13811    13771     -40     

@mergify mergify bot merged commit f162c6d into v1.3 Aug 25, 2020
@mergify mergify bot deleted the mergify/bp/v1.3/pr-11384 branch August 25, 2020 07:23
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