Merge foreign-memaccess #168
Closed
Conversation
…creens (Windows) Reviewed-by: prr
Reviewed-by: prr
Reviewed-by: serb, jdv
Reviewed-by: prr
Reviewed-by: psadhukhan, jdv
…o prescriptive Reviewed-by: serb
…dows Reviewed-by: jdv
….java: Test failed Reviewed-by: jdv
Reviewed-by: serb, jdv
Reviewed-by: prr, psadhukhan
…de of the given shape Reviewed-by: prr
… x-IBM949C) Modify ISO8859-16, x-eucJP-Open, x-IBM834 and x-IBM949C charset related files Reviewed-by: naoto
…evious cycles Reviewed-by: rkennke
Reviewed-by: epavlova, dholmes
Reviewed-by: dholmes
…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
Reviewed-by: mullan
… test comments interpreted as args Reviewed-by: serb
Reviewed-by: sspitsyn, cjplummer
Reviewed-by: sspitsyn, cjplummer
Reviewed-by: sspitsyn, cjplummer
…java fails on ubuntu Reviewed-by: serb
…acos Reviewed-by: serb
…olaris Reviewed-by: serb
…esolution > 100% Reviewed-by: prr, jdv
…and checking the 'opaque' checkbox, the area behind tabs is not red Reviewed-by: serb
…java failed Reviewed-by: prr
Reviewed-by: serb
and others
added 7 commits
May 14, 2020
Reviewed-by: alanb, sspitsyn
… initPhase2 Reviewed-by: chegar
…java Reviewed-by: dfuchs, joehw, alanb
Reviewed-by: erikj
Reviewed-by: psandoz
|
|
|
Mailing list message from Maurizio Cimadamore on panama-dev: Taking a look Maurizio On 15/05/2020 12:06, J.Duke wrote: |
|
@openjdk-bot This change is no longer ready for integration - check the PR body for details. |
|
/integrate |
|
/sponsor |
|
@openjdk-bot |
|
@mcimadamore @openjdk-bot |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
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 branchforeign-abi:The following file contains merge conflicts:
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.
When you have resolved the conflicts resulting from the
git mergecommand 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:
Note: if you are using SSH to push commits to GitHub, then change the URL in the above
git pushcommand accordingly.Thanks,
J. Duke
Progress
Error
Download
$ git fetch https://git.openjdk.java.net/panama-foreign pull/168/head:pull/168$ git checkout pull/168