[foreign-abi] RFR: Merge foreign-memaccess
J.Duke
duke at openjdk.java.net
Fri Aug 28 11:08:52 UTC 2020
Hi all,
this is an _automatically_ generated pull request to notify you that there are 79 commits from the branch
`foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:
The following file contains merge conflicts:
- src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
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 +49:openjdk-bot-49
$ git checkout openjdk-bot-49
# 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-49:49
_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
- 8245462: HttpClient send throws InterruptedException when interrupted but does not cancel request
- 8252414: Redundant suspend check when determining if a java thread is safe
- 8251538: Modernize and lint Dynalink code
- 8251557: Avoid dumping unused symbols/strings into the CDS archive
- 8251921: Expand default constructor warning to cover more cases
- 8252458: Test tools/javac/parser/JavacParserTest.java fails on Windows after JDK-8237041
- 8252467: AOT need to process new markId DEOPT_MH_HANDLER_ENTRY in compiled code
- 8237041: AssertionError in parsing
- ... and 69 more: https://git.openjdk.java.net/panama-foreign/compare/81c74633...39e27c7c
The webrev contains the conflicts with foreign-abi:
- merge conflicts: https://webrevs.openjdk.java.net/panama-foreign/296/webrev.00.conflicts
Changes: https://git.openjdk.java.net/panama-foreign/pull/296/files
Stats: 11263 lines in 670 files changed: 7782 ins; 2323 del; 1158 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/296.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/296/head:pull/296
PR: https://git.openjdk.java.net/panama-foreign/pull/296
More information about the panama-dev
mailing list