[foreign-memaccess] RFR: Merge master [v2]
J.Duke
duke at openjdk.java.net
Fri Oct 16 12:17:53 UTC 2020
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 107 commits from the branch `master`that
> can **not** be merged into the branch `foreign-memaccess`:
> The following file contains merge conflicts:
>
> - src/hotspot/share/classfile/classFileParser.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-memaccess $ git pull https://github.com/openjdk/panama-foreign.git foreign-memaccess
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign.git +63:openjdk-bot-63
> $ git checkout openjdk-bot-63
>
> # Merge the target branch
> $ git merge foreign-memaccess
>
> 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-63:63
>
> _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 419 additional commits since the last
revision:
- Fix buffer test
- Merge branch 'foreign-memaccess' into openjdk-bot-63
- 8254343: Revisit API for supporting mapped memory segments
Reviewed-by: psandoz
- Automatic merge of master into foreign-memaccess
- 8253937: Simplify support for shared memory segment
Reviewed-by: psandoz
- Merge master
- Investigate ways to make handoff-like operation more explicit (foreign-memacess edition)
Reviewed-by: jvernee
- Automatic merge of master into foreign-memaccess
- 8253472: Hotspot code should special case ScopedAccessError
Reviewed-by: eosterlund, jvernee, sundar
- 8253355: Add some overloads to memory access API
Reviewed-by: sundar, jvernee
- ... and 409 more: https://git.openjdk.java.net/panama-foreign/compare/68f0d9bd...134a3b99
-------------
Changes:
- all: https://git.openjdk.java.net/panama-foreign/pull/381/files
- new: https://git.openjdk.java.net/panama-foreign/pull/381/files/68f0d9bd..134a3b99
Webrevs:
- full: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=381&range=01
- incr: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=381&range=00-01
Stats: 8072 lines in 81 files changed: 5377 ins; 1540 del; 1155 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/381.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/381/head:pull/381
PR: https://git.openjdk.java.net/panama-foreign/pull/381
More information about the panama-dev
mailing list