[foreign-memaccess+abi] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri Dec 3 11:07:54 UTC 2021
Hi all,
this is an _automatically_ generated pull request to notify you that there are 108 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
The following files contains merge conflicts:
- src/hotspot/cpu/x86/universalUpcallHandler_x86_64.cpp
- src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/FunctionDescriptor.java
- src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/abi/CallingSequenceBuilder.java
- test/jdk/java/foreign/TestUpcall.java
- test/jdk/java/foreign/callarranger/TestSysVCallArranger.java
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 +108:openjdk-bot-108
$ git checkout openjdk-bot-108
# 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-108:108
_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:
- Automatic merge of jdk:master into master
- 8278139: G1: Refactor G1BlockOffsetTablePart::block_at_or_preceding
- 8277916: Gather non-strong reference count logic in a single place
- 8278154: SimpleFileServer#createFileServer() should specify that the returned server is not started
- 8278168: Add a few missing words to the specification of Files.mismatch
- 8278163: --with-cacerts-src variable resolved after GenerateCacerts recipe setup
- 8272234: Pass originating elements from Filer to JavaFileManager
- 8278115: gc/stress/gclocker/TestGCLockerWithSerial.java has duplicate -Xmx
- 8278116: runtime/modules/LoadUnloadModuleStress.java has duplicate -Xmx
- 8278174: runtime/cds/appcds/LambdaWithJavaAgent.java fails with release VMs
- ... and 98 more: https://git.openjdk.java.net/panama-foreign/compare/ddb61725...79cda8ef
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=623&range=00.conflicts
Changes: https://git.openjdk.java.net/panama-foreign/pull/623/files
Stats: 8479 lines in 320 files changed: 5441 ins; 1617 del; 1421 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/623.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/623/head:pull/623
PR: https://git.openjdk.java.net/panama-foreign/pull/623
More information about the panama-dev
mailing list