[foreign-memaccess+abi] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri Nov 12 11:08:09 UTC 2021
Hi all,
this is an _automatically_ generated pull request to notify you that there are 94 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
The following file contains merge conflicts:
- src/hotspot/cpu/aarch64/macroAssembler_aarch64.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+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 +105:openjdk-bot-105
$ git checkout openjdk-bot-105
# 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-105:105
_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
- 8273277: C2: Move conditional negation into rc_predicate
- 8275329: ZGC: vmTestbase/gc/gctests/SoftReference/soft004/soft004.java fails with assert(_phases->length() <= 1000) failed: Too many recored phases?
- 8275197: Remove unused fields in ThaiBuddhistChronology
- 8186670: Implement _onSpinWait() intrinsic for AArch64
- 8276265: jcmd man page is outdated
- 8276947: Clarify how DateTimeFormatterBuilder.appendFraction handles value ranges
- 8276994: java/nio/channels/Channels/TransferTo.java leaves multi-GB files in /tmp
- 8276763: java/nio/channels/SocketChannel/AdaptorStreams.java fails with "SocketTimeoutException: Read timed out"
- 8079267: [TEST_BUG] Test java/awt/Frame/MiscUndecorated/RepaintTest.java fails
- ... and 84 more: https://git.openjdk.java.net/panama-foreign/compare/a4e8d061...4ae4c4ca
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=612&range=00.conflicts
Changes: https://git.openjdk.java.net/panama-foreign/pull/612/files
Stats: 12026 lines in 460 files changed: 8492 ins; 1894 del; 1640 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/612.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/612/head:pull/612
PR: https://git.openjdk.java.net/panama-foreign/pull/612
More information about the panama-dev
mailing list