[foreign-abi] RFR: Merge foreign-memaccess [v3]
J.Duke
duke at openjdk.java.net
Fri Nov 6 13:21:39 UTC 2020
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 134 commits from the branch `foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:
>
> The following file contains merge conflicts:
>
> - test/micro/org/openjdk/bench/jdk/incubator/foreign/points/support/libJNIPoint.c
>
> 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 +70:openjdk-bot-70
> $ git checkout openjdk-bot-70
>
> # 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-70:70
>
> _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 pull request now contains 269 commits:
- fix whitespace
- Merge foreign-memaccess
- Merge branch 'foreign-abi' into 70
- 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
- 8254260: Consider splitting binding recipe operators that serve a dual role
Reviewed-by: mcimadamore
- ... and 259 more: https://git.openjdk.java.net/panama-foreign/compare/4ff38697...c2a431de
-------------
Changes: https://git.openjdk.java.net/panama-foreign/pull/388/files
Webrev: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=388&range=02
Stats: 67638 lines in 216 files changed: 67456 ins; 95 del; 87 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/388.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/388/head:pull/388
PR: https://git.openjdk.java.net/panama-foreign/pull/388
More information about the panama-dev
mailing list