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

Add memory operation syscalls (backport #16447) #17648

Merged
merged 2 commits into from
Jun 2, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 1, 2021

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

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

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:   programs/bpf/rust/sysvar/tests/lib.rs
	modified:   programs/bpf/tests/programs.rs
	modified:   programs/bpf_loader/src/syscalls.rs
	modified:   sdk/program/src/lib.rs
	new file:   sdk/program/src/program_memory.rs
	modified:   sdk/program/src/program_stubs.rs
	modified:   sdk/src/feature_set.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   programs/bpf/Cargo.lock

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
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jun 1, 2021
@solana-grimes
Copy link
Contributor

😱 New commits were pushed while the automerge label was present.

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jun 1, 2021
@jackcmay jackcmay merged commit 2798271 into v1.7 Jun 2, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-16447 branch June 2, 2021 01:44
@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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants