[foreign-memaccess] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri Oct 2 11:05:57 UTC 2020
Hi all,
this is an _automatically_ generated pull request to notify you that there are 101 commits from the branch `master`that
can **not** be merged into the branch `foreign-memaccess`:
The following files contains merge conflicts:
- src/hotspot/share/classfile/classFileParser.cpp
- src/hotspot/share/classfile/vmSymbols.hpp
- test/jdk/java/foreign/TestArrays.java
- test/jdk/java/foreign/TestByteBuffer.java
All Committers in this [project](https://openjdk.java.net/census#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-memaccess
$ git pull https://github.com/openjdk/panama-foreign.git foreign-memaccess
# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/panama-foreign.git +60:openjdk-bot-60
$ git checkout openjdk-bot-60
# Merge the target branch
$ git merge foreign-memaccess
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 master'
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.git openjdk-bot-60:60
_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 jdk:master into master
- 5078989: Null Pointer exception in SpinnerListMode
- 8253891: Debug x86_32 builds fail after JDK-8239090
- 8253118: Avoid unnecessary deopts when OSR nmethods of the same level are present.
- 8249783: Simplify DerValue and DerInputStream
- 8253747: tools/jpackage/share/AppImagePackageTest.java fails with InstalledPackageSize: 0
- 8232840: java/math/BigInteger/largeMemory/SymmetricRangeTests.java fails due to "OutOfMemoryError: Requested array size exceeds VM limit"
- 8253904: Revert Tokenizer improvements JDK-8224225
- 8253824: Revert JDK-8253089 since VS warning C4307 has been disabled
- 8224225: Tokenizer improvements
- ... and 91 more: https://git.openjdk.java.net/panama-foreign/compare/83b9ce62...43c45e39
The webrev contains the conflicts with foreign-memaccess:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=368&range=00.conflicts
Changes: https://git.openjdk.java.net/panama-foreign/pull/368/files
Stats: 16558 lines in 1917 files changed: 6785 ins; 3939 del; 5834 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/368.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/368/head:pull/368
PR: https://git.openjdk.java.net/panama-foreign/pull/368
More information about the panama-dev
mailing list