[foreign-memaccess+abi] RFR: Merge master
J.Duke
duke at openjdk.java.net
Mon May 23 10:37:56 UTC 2022
Hi all,
this is an _automatically_ generated pull request to notify you that there are 253 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
Over 73 files contains merge conflicts.
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+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 +124:openjdk-bot-124
$ git checkout openjdk-bot-124
# 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-124:124
_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
- 8287154: java/nio/channels/FileChannel/LargeMapTest.java does not compile
- 8286825: Linker naming cleanup
- 8276549: Improve documentation about ContainerPtr encoding
- 8286715: Generalize MemorySegment::ofBuffer
- 8287024: G1: Improve the API boundary between HeapRegionRemSet and G1CardSet
- 8287053: Avoid redundant HashMap.containsKey calls in ZoneInfoFile.getZoneInfo0
- 8189669: Deduplicate VerifyOption documentation
- 8287044: Loom: Incorrect StackChunk::pc accessors
- 8285399: JNI exception pending in awt_GraphicsEnv.c:1432
- ... and 243 more: https://git.openjdk.java.net/panama-foreign/compare/ec31965d...04f84d6c
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=685&range=00.conflicts
Changes: https://git.openjdk.java.net/panama-foreign/pull/685/files
Stats: 216674 lines in 2763 files changed: 161445 ins; 42309 del; 12920 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/685.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/685/head:pull/685
PR: https://git.openjdk.java.net/panama-foreign/pull/685
More information about the panama-dev
mailing list