[foreign-jextract] RFR: Merge foreign-memaccess+abi
J.Duke
duke at openjdk.java.net
Mon May 23 11:21:46 UTC 2022
Hi all,
this is an _automatically_ generated pull request to notify you that there are 254 commits from the branch `foreign-memaccess+abi`that can **not** be merged into the branch `foreign-jextract`:
The following file contains merge conflicts:
- make/conf/docs-modules.conf
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-jextract
$ git pull https://github.com/openjdk/panama-foreign.git foreign-jextract
# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/panama-foreign.git +126:openjdk-bot-126
$ git checkout openjdk-bot-126
# Merge the target branch
$ git merge foreign-jextract
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+abi'
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-126:126
_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 branch 'foreign-jextract' into 126
- Merge master
- 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
- ... and 245 more: https://git.openjdk.java.net/panama-foreign/compare/518b9b6f...809c6491
The webrevs contain the adjustments done while merging with regards to each parent branch:
- foreign-jextract: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=687&range=00.0
- foreign-memaccess+abi: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=687&range=00.1
Changes: https://git.openjdk.java.net/panama-foreign/pull/687/files
Stats: 190222 lines in 2752 files changed: 136121 ins; 41256 del; 12845 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/687.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/687/head:pull/687
PR: https://git.openjdk.java.net/panama-foreign/pull/687
More information about the panama-dev
mailing list