[foreign-abi] RFR: Merge foreign-memaccess

J.Duke duke at openjdk.java.net
Fri May 15 11:06:53 UTC 2020

Hi all,

this is an _automatically_ generated pull request to notify you that there are 112 commits from the branch
`foreign-memaccess`that 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](https://openjdk.java.net/census#Optional[panama]) have access to my [personal
fork](https://github.com/openjdk-bot/panama-foreign) 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](https://wiki.openjdk.java.net/display/skara#Skara-Personalforks) of the
[openjdk/panama-foreign](https://github.com/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.

J. Duke


Commit messages:
 - Automatic merge of master into foreign-memaccess
 - Automatic merge of jdk:master into master
 - 8245024: Simplify and eagerly initialize StringConcatFactory
 - 8245046: SetupTarget incorrect for hotspot-ide-project
 - 8209774: Refactor shell test javax/xml/jaxp/common/8035437/run.sh to java
 - 8244961: MethodHandles::privateLookupIn throws NPE when called during initPhase2
 - 8243012: Fix issues in j.l.i package info
 - 8242524: Use different default CDS archives depending on UseCompressOops
 - 8243947: [TESTBUG] hotspot/jtreg:hotspot_appcds_dynamic fails when the JDK doesn't have default CDS archive
 - 8244340: Handshake processing thread lacks yielding
 - ... and 102 more: https://git.openjdk.java.net/panama-foreign/compare/2349db7a...39ab6186

The webrev contains the conflicts with foreign-abi:
 - merge conflicts: https://webrevs.openjdk.java.net/panama-foreign/168/webrev.00.conflicts

Changes: https://git.openjdk.java.net/panama-foreign/pull/168/files
  Stats: 13401 lines in 402 files changed: 7833 ins; 3511 del; 2057 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/168.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/168/head:pull/168

PR: https://git.openjdk.java.net/panama-foreign/pull/168

More information about the panama-dev mailing list