[foreign-memaccess+abi] RFR: Merge master [v2]
J. Duke
duke at openjdk.org
Fri Mar 31 15:23:05 UTC 2023
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 90 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
>
> The following files contains merge conflicts:
>
> - src/java.base/share/classes/jdk/internal/foreign/CABI.java
> - test/jdk/java/foreign/TestUnsupportedLinker.java
>
> All Committers in this [project](https://openjdk.org/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.org/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+abi
> $ git pull https://github.com/openjdk/panama-foreign.git foreign-memaccess+abi
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign.git +137:openjdk-bot-137
> $ git checkout openjdk-bot-137
>
> # Merge the target branch
> $ git merge foreign-memaccess+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 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-137:137
>
>
> _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 1038 additional commits since the last revision:
- Merge master
- Automatic merge of master into foreign-memaccess+abi
- Merge master
- Fix issue in custom arena code
Reviewed-by: jvernee
- 8298096: Refine javadoc for Linker
Reviewed-by: jvernee
- 8304276: Add javadoc for custom arena
Reviewed-by: jvernee
- Fix minor typos in ffi document
Reviewed-by: jvernee
- Refresh FFM API documents
Reviewed-by: jvernee
- 8296315: Add get/set-AtIndex methods for byte, boolean
Reviewed-by: mcimadamore
- Merge master
- ... and 1028 more: https://git.openjdk.org/panama-foreign/compare/8be67073...c1b7723c
-------------
Changes:
- all: https://git.openjdk.org/panama-foreign/pull/826/files
- new: https://git.openjdk.org/panama-foreign/pull/826/files/8be67073..c1b7723c
Webrevs:
- full: https://webrevs.openjdk.org/?repo=panama-foreign&pr=826&range=01
- incr: https://webrevs.openjdk.org/?repo=panama-foreign&pr=826&range=00-01
Stats: 14920 lines in 274 files changed: 6960 ins; 6002 del; 1958 mod
Patch: https://git.openjdk.org/panama-foreign/pull/826.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/826/head:pull/826
PR: https://git.openjdk.org/panama-foreign/pull/826
More information about the panama-dev
mailing list