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

Merge foreign-memaccess #168

Closed
wants to merge 114 commits into from
Closed

Merge foreign-memaccess #168

wants to merge 114 commits into from

Conversation

@openjdk-bot
Copy link
Contributor

@openjdk-bot openjdk-bot commented May 15, 2020

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

mrserb and others added 30 commits Apr 27, 2020
… x-IBM949C)

Modify ISO8859-16, x-eucJP-Open, x-IBM834 and x-IBM949C charset related files

Reviewed-by: naoto
…ing itable/vtable for shared classes

Record loader constraints for built-in class which is loaded by app loader or platform loader in shared archive in dump time.  When the class loaded from shared archive at runtime, directly check loader constraints using the saved info so avoid lengthy relayout i/v-table at class link stage.

Reviewed-by: iklam, ccheung
… test comments interpreted as args

Reviewed-by: serb
…and checking the 'opaque' checkbox, the area behind tabs is not red

Reviewed-by: serb
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 15, 2020

👋 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
Copy link

@mlbridge mlbridge bot commented May 15, 2020

@mlbridge
Copy link

@mlbridge mlbridge bot commented May 15, 2020

Mailing list message from Maurizio Cimadamore on panama-dev:

Taking a look

Maurizio

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

@openjdk
Copy link

@openjdk openjdk bot commented May 15, 2020

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

@openjdk-bot
Copy link
Contributor Author

@openjdk-bot openjdk-bot commented May 15, 2020

/integrate

@mcimadamore
Copy link
Collaborator

@mcimadamore mcimadamore commented May 15, 2020

/sponsor

@openjdk openjdk bot added the sponsor label May 15, 2020
@openjdk
Copy link

@openjdk openjdk bot commented May 15, 2020

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

@openjdk
Copy link

@openjdk openjdk bot commented May 15, 2020

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment