[foreign-preview] RFR: Merge master

J.Duke duke at openjdk.java.net
Fri Apr 22 11:08:40 UTC 2022


Hi all,

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

The following files contains merge conflicts:

- make/test/BuildMicrobenchmark.gmk
- src/hotspot/share/prims/scopedMemoryAccess.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 +119:openjdk-bot-119
$ git checkout openjdk-bot-119

# 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-119:119


_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
 - 8284995: G1: Do not mark through Closed Archive regions during concurrent mark
 - 8277056: Combining several C2 Print* flags asserts in xmlStream::pop_tag
 - 8285369: C2: emit reduction flag value in node and loop dumps
 - 8284993: Replace System.exit call in swing tests with RuntimeException
 - 8285342: Zero build failure with clang due to values not handled in switch
 - 8285386: java/util/HashMap/WhiteBoxResizeTest.java fails in tier7 after JDK-8186958
 - 8283324: CLDRConverter run time increased by 3x
 - 8284189: Replace usages of 'a the' in java.desktop
 - 8285040: PPC64 intrinsics for divideUnsigned and remainderUnsigned methods in java.lang.Integer and java.lang.Long
 - ... and 88 more: https://git.openjdk.java.net/panama-foreign/compare/2dac53be...9009df1d

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

Changes: https://git.openjdk.java.net/panama-foreign/pull/678/files
  Stats: 14535 lines in 1013 files changed: 8635 ins; 2473 del; 3427 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/678.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/678/head:pull/678

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


More information about the panama-dev mailing list