[foreign-abi] RFR: Merge foreign-memaccess [v2]
J.Duke
duke at openjdk.java.net
Fri Nov 13 19:07:25 UTC 2020
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 94 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/nio/Direct-X-Buffer.java.template
> - src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
> - src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MemoryScope.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-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 +74:openjdk-bot-74
> $ git checkout openjdk-bot-74
>
> # 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-74:74
>
> _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
J. Duke has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains 270 additional commits since the last revision:
- Merge branch 'foreign-abi' into openjdk-bot-74
- 8256080: AArch64: fatal error with unexpected intrinsic id _linkToNative
Reviewed-by: jvernee
- Fix Aarch64 build failure
Reviewed-by: jvernee
- Merge foreign-memaccess
- Automatic merge of foreign-memaccess into foreign-abi
- Automatic merge of foreign-memaccess into foreign-abi
- Merge foreign-memaccess
- Merge foreign-memaccess
- 8254682: Close MemorySegments passed to upcalls after the upcall is done
Reviewed-by: mcimadamore
- Automatic merge of foreign-memaccess into foreign-abi
- ... and 260 more: https://git.openjdk.java.net/panama-foreign/compare/b8762787...019200a7
-------------
Changes:
- all: https://git.openjdk.java.net/panama-foreign/pull/394/files
- new: https://git.openjdk.java.net/panama-foreign/pull/394/files/b8762787..019200a7
Webrevs:
- full: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=394&range=01
- incr: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=394&range=00-01
Stats: 67653 lines in 217 files changed: 67477 ins; 88 del; 88 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/394.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/394/head:pull/394
PR: https://git.openjdk.java.net/panama-foreign/pull/394
More information about the panama-dev
mailing list