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

Add memory operation syscalls (backport #16447) #18149

Merged
merged 2 commits into from
Jun 22, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 22, 2021

This is an automatic backport of pull request #16447 done by Mergify.
Cherry-pick of 2b50529 has failed:

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

You are currently cherry-picking commit 2b5052926.
  (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:   programs/bpf/Cargo.toml
	modified:   programs/bpf/build.rs
	modified:   programs/bpf/rust/mem/Cargo.toml
	new file:   programs/bpf/rust/mem/src/entrypoint.rs
	modified:   programs/bpf/rust/mem/src/lib.rs
	new file:   programs/bpf/rust/mem/tests/lib.rs
	new file:   programs/bpf/rust/membuiltins/Cargo.toml
	new file:   programs/bpf/rust/membuiltins/src/lib.rs
	modified:   sdk/program/src/lib.rs
	new file:   sdk/program/src/program_memory.rs
	modified:   sdk/program/src/program_stubs.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   programs/bpf/Cargo.lock
	deleted by us:   programs/bpf/rust/sysvar/tests/lib.rs
	both modified:   programs/bpf/tests/programs.rs
	both modified:   programs/bpf_loader/src/syscalls.rs
	both modified:   sdk/src/feature_set.rs

To fix up this pull request, you can check it out 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 config editor.

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

(cherry picked from commit 2b50529)

# Conflicts:
#	programs/bpf/Cargo.lock
#	programs/bpf/rust/sysvar/tests/lib.rs
#	programs/bpf/tests/programs.rs
#	programs/bpf_loader/src/syscalls.rs
#	sdk/src/feature_set.rs
@mergify mergify bot added the conflicts label Jun 22, 2021
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 22, 2021
@codecov
Copy link

codecov bot commented Jun 22, 2021

Codecov Report

Merging #18149 (fef4caa) into v1.6 (e259388) will decrease coverage by 0.0%.
The diff coverage is 21.4%.

@@            Coverage Diff            @@
##             v1.6   #18149     +/-   ##
=========================================
- Coverage    82.6%    82.5%   -0.1%     
=========================================
  Files         423      424      +1     
  Lines      117150   117271    +121     
=========================================
+ Hits        96797    96834     +37     
- Misses      20353    20437     +84     

@mergify mergify bot merged commit 57baf7f into v1.6 Jun 22, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-16447 branch June 22, 2021 20:00
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
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