[foreign-memaccess+abi] RFR: Merge master [v2]

J. Duke duke at openjdk.org
Tue Sep 12 11:53:13 UTC 2023


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 407 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
> 
> The following files contains merge conflicts:
> 
> - src/java.base/share/classes/java/lang/foreign/SegmentAllocator.java
> - test/jdk/java/foreign/TestIllegalLink.java
> - test/jdk/java/foreign/UpcallTestHelper.java
> 
> All Committers in this [project](https://openjdk.org/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.org/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 +141:openjdk-bot-141
> $ git checkout openjdk-bot-141
> 
> # 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-141:141
> 
> 
> _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 408 commits:

 - Merge branch 'foreign-memaccess+abi' into openjdk-bot-141
 - Automatic merge of jdk:master into master
 - 8307352: AARCH64: Improve itable_stub
   
   Reviewed-by: simonis, eastigeevich, aph
 - 8315686: G1: Disallow evacuation of marking regions in a Prepare Mixed gc
   
   Reviewed-by: ayang, iwalulya
 - 8315605: G1: Add number of nmethods in code roots scanning statistics
   
   Reviewed-by: iwalulya, ayang
 - 8315774: Enable parallelism in vmTestbase/gc/g1/unloading tests
   
   Reviewed-by: phh, lmesnik
 - 8308869: C2: use profile data in subtype checks when profile has more than one class
   
   Co-authored-by: Fei Yang <fyang at openjdk.org>
   Reviewed-by: vlivanov, thartmann
 - 8315702: jcmd Thread.dump_to_file slow with millions of virtual threads
   
   Reviewed-by: mchung, amenkov, jpai
 - 8312075: FileChooser.win32.newFolder is not updated when changing Locale
   
   Reviewed-by: aivanov, abhiscxk
 - 8315594: Open source few headless Swing misc tests
   
   Reviewed-by: azvegint
 - ... and 398 more: https://git.openjdk.org/panama-foreign/compare/9e3252ed...4c7eaa3b

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

Changes: https://git.openjdk.org/panama-foreign/pull/882/files
 Webrev: https://webrevs.openjdk.org/?repo=panama-foreign&pr=882&range=01
  Stats: 59073 lines in 1976 files changed: 33498 ins; 12771 del; 12804 mod
  Patch: https://git.openjdk.org/panama-foreign/pull/882.diff
  Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/882/head:pull/882

PR: https://git.openjdk.org/panama-foreign/pull/882


More information about the panama-dev mailing list