[foreign-abi] RFR: Merge foreign-memaccess
J.Duke
duke at openjdk.java.net
Fri Oct 23 11:07:04 UTC 2020
Hi all,
this is an _automatically_ generated pull request to notify you that there are 149 commits from the branch `foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:
The following files contains merge conflicts:
- src/hotspot/share/c1/c1_IR.hpp
- src/hotspot/share/code/pcDesc.hpp
- src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
- src/hotspot/share/opto/compile.cpp
- src/hotspot/share/opto/output.cpp
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-abi
$ git pull https://github.com/openjdk/panama-foreign.git foreign-abi
# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/panama-foreign.git +67:openjdk-bot-67
$ git checkout openjdk-bot-67
# 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.git openjdk-bot-67:67
_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
- 8255129: [PPC64, s390] Check vector_size_supported and add VectorReinterpret node
- 8255274: [PPC64, s390] wrong StringLatin1.indexOf version matched
- 8254982: (tz) Upgrade time-zone data to tzdata2020c
- 8254670: SVE test uses linux-specific api
- 8254286: Wrong inference in switch expression with "null" arm
- 8249675: x86: frequency extraction from cpu brand string is incomplete
- 8255067: Restore Copyright line in file modified by 8253191
- 8255131: G1CollectedHeap::is_in() returns wrong result
- ... and 139 more: https://git.openjdk.java.net/panama-foreign/compare/63df0eca...3a792d53
The webrev contains the conflicts with foreign-abi:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=385&range=00.conflicts
Changes: https://git.openjdk.java.net/panama-foreign/pull/385/files
Stats: 64452 lines in 855 files changed: 48357 ins; 12251 del; 3844 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/385.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/385/head:pull/385
PR: https://git.openjdk.java.net/panama-foreign/pull/385
More information about the panama-dev
mailing list