[foreign-jextract] Merge foreign-abi
J.Duke
duke at openjdk.java.net
Thu Apr 23 00:07:03 UTC 2020
Hi all,
this is an _automatically_ generated pull request to notify you that there are 5 commits from the branch
`foreign-abi`that can **not** be merged into the branch `foreign-jextract`:
The following files contains merge conflicts:
- src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/Utils.java
- test/jdk/java/foreign/Cstring.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-jextract
$ git pull https://github.com/openjdk/panama-foreign foreign-jextract
# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/panama-foreign +28:openjdk-bot-28
$ git checkout openjdk-bot-28
# Merge the target branch
$ git merge foreign-jextract
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-abi'
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-28:28
_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:
- Merge branch 'foreign-jextract' into 28
- Automatic merge of foreign-memaccess into foreign-abi
- Merge foreign-memaccess
- JDK-8243300: Move var handle combinators into foreign incubator module
- Fix bad use of MemorySegment::spliterator in TestSharedAccess
- JDK-8243284: Remove Foreign class
Changes: https://git.openjdk.java.net/panama-foreign/pull/128/files
Webrev: https://webrevs.openjdk.java.net/panama-foreign/128/webrev.00
The following webrevs contain only the adjustments done while merging with regards to each parent branch:
- foreign-jextract: https://webrevs.openjdk.java.net/panama-foreign/128/webrev.00.0
- foreign-abi: https://webrevs.openjdk.java.net/panama-foreign/128/webrev.00.1
Stats: 1456 lines in 31 files changed: 658 ins; 698 del; 100 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/128.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/128/head:pull/128
PR: https://git.openjdk.java.net/panama-foreign/pull/128
More information about the panama-dev
mailing list