[foreign-memaccess+abi] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri Jan 21 11:08:26 UTC 2022
Hi all,
this is an _automatically_ generated pull request to notify you that there are 141 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/aarch64/macroAssembler_aarch64.cpp
- src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
- src/hotspot/cpu/aarch64/universalUpcallHandler_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 +113:openjdk-bot-113
$ git checkout openjdk-bot-113
# 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-113:113
_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
- 8280393: Promote use of HtmlTree factory methods
- 8277120: Use Optional.isEmpty instead of !Optional.isPresent in java.net.http
- 8278784: C2: Refactor PhaseIdealLoop::remix_address_expressions() so it operates on longs
- 8280401: [sspi] gss_accept_sec_context leaves output_token uninitialized
- 8258814: Compilation logging crashes for thread suspension / debugging tests
- 8280413: ProblemList jdk/jfr/event/oldobject/TestLargeRootSet.java on all X64 platforms
- 8278472: Invalid value set to CANDIDATEFORM structure
- 8279282: [vectorapi] Matcher::supports_vector_comparison_unsigned is not needed on x86
- 8277535: Remove redundant Stream.distinct()/sorted() steps
- ... and 131 more: https://git.openjdk.java.net/panama-foreign/compare/b4951efe...497f3acf
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=632&range=00.conflicts
Changes: https://git.openjdk.java.net/panama-foreign/pull/632/files
Stats: 9366 lines in 391 files changed: 6336 ins; 1905 del; 1125 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/632.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/632/head:pull/632
PR: https://git.openjdk.java.net/panama-foreign/pull/632
More information about the panama-dev
mailing list