[foreign-memaccess+abi] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri Jun 4 11:08:32 UTC 2021
Hi all,
this is an _automatically_ generated pull request to notify you that there are 45 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
The following file contains merge conflicts:
- test/jdk/java/foreign/TestUpcall.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 +98:openjdk-bot-98
$ git checkout openjdk-bot-98
# 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-98:98
_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
- 8268174: Move x86-specific stub declarations into stubRoutines_x86.hpp
- 8264305: Create implementation for native accessibility peer for Statusbar java role
- 8268214: Use system zlib and disable dtrace when building linux-aarch64 at Oracle
- 8268142: Switch to jdk-17+24 for macosx-aarch64 at Oracle
- 8267917: mark hotspot containers tests which ignore external VM flags
- 8268224: Cleanup references to "strictfp" in core lib comments
- 8268095: CDS MethodHandle tests should add -XX:-VerifyDependencies
- 8267939: Clarify the specification of iterator and spliterator forEachRemaining
- 8266019: StreamResult(File) writes to incorrect file path if # is part of the file path
- ... and 35 more: https://git.openjdk.java.net/panama-foreign/compare/21a08587...36320414
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=549&range=00.conflicts
Changes: https://git.openjdk.java.net/panama-foreign/pull/549/files
Stats: 433158 lines in 461 files changed: 429826 ins; 1713 del; 1619 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/549.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/549/head:pull/549
PR: https://git.openjdk.java.net/panama-foreign/pull/549
More information about the panama-dev
mailing list