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

J. Duke duke at openjdk.org
Tue Sep 12 11:21:01 UTC 2023


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 77 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
> 
> The following file contains merge conflicts:
> 
> - src/java.base/share/classes/java/lang/foreign/SegmentAllocator.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 +140:openjdk-bot-140
> $ git checkout openjdk-bot-140
> 
> # 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-140:140
> 
> 
> _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 78 commits:

 - Merge branch 'foreign-memaccess+abi' into openjdk-bot-140
 - Automatic merge of jdk:master into master
 - 8311648: Refactor the Arena/Chunk/ChunkPool interface
   
   Reviewed-by: stuefe, coleenp
 - 8313224: Avoid calling JavaThread::current() in MemAllocator::Allocation constructor
   
   Reviewed-by: tschatzl, coleenp
 - 8312461: JNI warnings in SunMSCApi provider
   
   Reviewed-by: valeriep, djelinski
 - 8312882: Update the CONTRIBUTING.md with pointers to lifecycle of a PR
   
   Reviewed-by: erikj, jwilhelm
 - 8304292: Memory leak related to ClassLoader::update_class_path_entry_list
   
   Reviewed-by: dholmes, iklam
 - 8313899: JVMCI exception Translation can fail in TranslatedException.<clinit>
   
   Reviewed-by: never, thartmann
 - 8313633: [macOS] java/awt/dnd/NextDropActionTest/NextDropActionTest.java fails with java.lang.RuntimeException: wrong next drop action!
   
   Reviewed-by: honkar, serb
 - 8312259: StatusResponseManager unused code clean up
   
   Reviewed-by: mpowers, jnimeh
 - ... and 68 more: https://git.openjdk.org/panama-foreign/compare/9e3252ed...7bd7fb0a

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

Changes: https://git.openjdk.org/panama-foreign/pull/861/files
 Webrev: https://webrevs.openjdk.org/?repo=panama-foreign&pr=861&range=01
  Stats: 12374 lines in 615 files changed: 4443 ins; 3957 del; 3974 mod
  Patch: https://git.openjdk.org/panama-foreign/pull/861.diff
  Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/861/head:pull/861

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


More information about the panama-dev mailing list