[foreign-preview] RFR: Merge master

J.Duke duke at openjdk.java.net
Fri Feb 25 11:20:59 UTC 2022


Hi all,

this is an _automatically_ generated pull request to notify you that there are 68 commits from the branch `master`that can **not** be merged into the branch `foreign-preview`:

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-preview
$ git pull https://github.com/openjdk/panama-foreign.git foreign-preview

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/panama-foreign.git +116:openjdk-bot-116
$ git checkout openjdk-bot-116

# Merge the target branch
$ git merge foreign-preview


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-116:116


_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
 - 8282347: AARCH64: Untaken branch in has_negatives stub
 - 8206187: javax/management/remote/mandatory/connection/DefaultAgentFilterTest.java fails with Port already in use
 - 8280357: user.home = "?" when running with systemd DynamicUser=true
 - 8005885: enhance PrintCodeCache to print more data
 - 8281525: Enable Zc:strictStrings flag in Visual Studio build
 - 8282307: Parallel: Incorrect discovery mode in PCReferenceProcessor
 - 8282348: Remove unused CardTable::dirty_card_iterate
 - 8277204: Implement PAC-RET branch protection on Linux/AArch64
 - 8282316: Operation before String case conversion
 - ... and 58 more: https://git.openjdk.java.net/panama-foreign/compare/cd3b60d5...7e0ce62c

The webrev contains the conflicts with foreign-preview:
 - merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=657&range=00.conflicts

Changes: https://git.openjdk.java.net/panama-foreign/pull/657/files
  Stats: 8056 lines in 192 files changed: 5290 ins; 1119 del; 1647 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/657.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/657/head:pull/657

PR: https://git.openjdk.java.net/panama-foreign/pull/657


More information about the panama-dev mailing list