Merge foreign-memaccess

[openjdk-bot]

Hi all,

this is an automatically generated pull request to notify you that there are 112 commits from the branch foreign-memaccessthat can not be merged into the branch foreign-abi:

The following file contains merge conflicts:

• src/java.base/share/classes/java/lang/System.java

All Committers in this project have access to my personal fork and can therefore help resolve these merge conflicts (you may want to coordinate who should do this).
The following paragraphs will give an example on how to solve these merge conflicts and push the resulting merge commit to this pull request.
The below commands should be run in a local clone of your personal fork of the openjdk/panama-foreign repository.

# Ensure target branch is up to date
$ git checkout foreign-abi
$ git pull https://github.com/openjdk/panama-foreign foreign-abi

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/panama-foreign +37:openjdk-bot-37
$ git checkout openjdk-bot-37

# Merge the target branch
$ git merge foreign-abi

When you have resolved the conflicts resulting from the git merge command above, run the following commands to create a merge commit:

$ git add paths/to/files/with/conflicts
$ git commit -m 'Merge foreign-memaccess'

When you have created the merge commit, run the following command to push the merge commit to this pull request:

$ git push https://github.com/openjdk-bot/panama-foreign openjdk-bot-37:37

Note: if you are using SSH to push commits to GitHub, then change the URL in the above git push command accordingly.

Thanks,
J. Duke

---

Progress

• Change must not contain extraneous whitespace
• Change must be properly reviewed

Error

 ⚠️ A merge PR must contain at least one commit from the source branch that is not already present in the target.

Download

$ git fetch https://git.openjdk.java.net/panama-foreign pull/168/head:pull/168
$ git checkout pull/168

[bridgekeeper]

👋 Welcome back duke! A progress list of the required criteria for merging this PR into foreign-abi will be added to the body of your pull request.

[mlbridge]

Webrevs

• 02: Full (d09d2ec)
• 01: Full (a09ccef)
• 00: Merge conflicts (foreign-abi) (39ab618)

[mlbridge]

Mailing list message from Maurizio Cimadamore on panama-dev:

Taking a look

Maurizio

On 15/05/2020 12:06, J.Duke wrote:

[openjdk]

@openjdk-bot This change is no longer ready for integration - check the PR body for details.

[openjdk-bot]

/integrate

[mcimadamore]

/sponsor

[openjdk]

@openjdk-bot
Your change (at version d09d2ec) is now ready to be sponsored by a Committer.

[openjdk]

@mcimadamore @openjdk-bot
Pushed as commit 9192f4c.