[foreign-preview] RFR: Merge master [v2]

J.Duke duke at openjdk.java.net
Wed Apr 27 16:39:04 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

J. Duke has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 99 commits:

 - Merge branch 'foreign-preview' into openjdk-bot-119
 - Automatic merge of jdk:master into master
 - 8284995: G1: Do not mark through Closed Archive regions during concurrent mark
   
   Reviewed-by: iwalulya, ayang
 - 8277056: Combining several C2 Print* flags asserts in xmlStream::pop_tag
   
   Reviewed-by: kvn, thartmann, xliu, dlong
 - 8285369: C2: emit reduction flag value in node and loop dumps
   
   Reviewed-by: kvn
 - 8284993: Replace System.exit call in swing tests with RuntimeException
   
   Reviewed-by: azvegint
 - 8285342: Zero build failure with clang due to values not handled in switch
   
   Reviewed-by: shade, aph
 - 8285386: java/util/HashMap/WhiteBoxResizeTest.java fails in tier7 after JDK-8186958
   
   Reviewed-by: lancea
 - 8283324: CLDRConverter run time increased by 3x
   
   Reviewed-by: ihse
 - 8284189: Replace usages of 'a the' in java.desktop
   
   Reviewed-by: jdv, prr, dmarkov
 - ... and 89 more: https://git.openjdk.java.net/panama-foreign/compare/1c3421e5...767038c9

-------------

Changes: https://git.openjdk.java.net/panama-foreign/pull/678/files
 Webrev: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=678&range=01
  Stats: 14531 lines in 1012 files changed: 8635 ins; 2473 del; 3423 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