[foreign-abi] RFR: Merge foreign-memaccess
J.Duke
duke at openjdk.java.net
Fri Apr 24 12:01:08 UTC 2020
Hi all,
this is an _automatically_ generated pull request to notify you that there are 110 commits from the branch
`foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:
The following files contains merge conflicts:
- src/java.base/share/classes/java/lang/System.java
- src/java.base/share/classes/jdk/internal/access/JavaLangAccess.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 +30:openjdk-bot-30
$ git checkout openjdk-bot-30
# 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-30:30
_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
-------------
Commit messages:
- Automatic merge of master into foreign-memaccess
- Automatic merge of jdk:master into master
- Merge
- 8243240: AArch64: Add support for MulVB
- 8239786: Shenandoah: print per-cycle statistics
- 8243477: FreeType library check should prefer 64-bit directory
- 8243029: Rewrite javax/net/ssl/compatibility/Compatibility.java with a flexible interop test framework
- 8242929: The values of jdk.tls.namedGroups should not be case-sensitive
- 8242905: AArch64: Client build failed
- 8241780: Allow \n@ inside inline tags
- ...omitting 100 further commits.
The webrev contains the conflicts with foreign-abi:
- merge conflicts: https://webrevs.openjdk.java.net/panama-foreign/131/webrev.00.conflicts
Changes: https://git.openjdk.java.net/panama-foreign/pull/131/files
Stats: 50538 lines in 835 files changed: 27477 ins; 19031 del; 4030 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/131.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/131/head:pull/131
PR: https://git.openjdk.java.net/panama-foreign/pull/131
More information about the panama-dev
mailing list