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

J.Duke duke at openjdk.java.net
Fri Apr 23 11:46:49 UTC 2021


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 233 commits from the branch `foreign-memaccess+abi`that can **not** be merged into the branch `foreign-jextract`:
> 
> The following file contains merge conflicts:
> 
> - make/conf/jib-profiles.js
> 
> 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-jextract
> $ git pull https://github.com/openjdk/panama-foreign.git foreign-jextract
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign.git +94:openjdk-bot-94
> $ git checkout openjdk-bot-94
> 
> # Merge the target branch
> $ git merge foreign-jextract
> 
> 
> 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 foreign-memaccess+abi'
> 
> 
> 
> 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-94:94
> 
> 
> _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 234 commits:

 - Merge branch 'foreign-jextract' into openjdk-bot-94
 - Automatic merge of master into foreign-memaccess+abi
 - Automatic merge of jdk:master into master
 - 8265759: Shenandoah: Avoid race for referent in assert
   
   Reviewed-by: shade, zgu
 - 8264842: IGV: different nodes sharing idx are treated as equal
   
   Introduce IGV-specific node identifier and encapsulate it in IGV by showing a
   configurable 'short node text' string instead.
   
   Reviewed-by: iveresov, kvn
 - 8265696: Move CDS sources to src/hotspot/shared/cds
   
   Reviewed-by: erikj, dholmes, stuefe
 - 8265798: Minimal build broken by JDK-8261090
   
   Reviewed-by: iklam
 - 8265484: Fix up TRAPS usage in GenerateOopMap::compute_map and callers
   
   Reviewed-by: iklam, dlong, coleenp
 - 8265683: vmTestbase/nsk/jdb tests failed with "JDWP exit error AGENT_ERROR_INTERNAL(181)"
   
   Reviewed-by: amenkov, dcubed
 - 8264196: Change link_and_cleanup_shared_classes(CATCH) to CHECK
   
   Reviewed-by: minqi, iklam
 - ... and 224 more: https://git.openjdk.java.net/panama-foreign/compare/2d00fa12...aaa4387c

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

Changes: https://git.openjdk.java.net/panama-foreign/pull/516/files
 Webrev: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=516&range=01
  Stats: 108454 lines in 2360 files changed: 52293 ins; 49619 del; 6542 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/516.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/516/head:pull/516

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


More information about the panama-dev mailing list