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

J.Duke duke at openjdk.java.net
Fri Nov 6 14:21:08 UTC 2020


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 135 commits from the branch `foreign-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 +71:openjdk-bot-71
> $ git checkout openjdk-bot-71
> 
> # 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-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-71:71
> 
> _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 incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains 376 additional commits since the last revision:

 - Merge branch 'foreign-jextract' into 71
 - Automatic merge of foreign-abi into foreign-jextract
 - Automatic merge of foreign-abi into foreign-jextract
 - Automatic merge of foreign-abi into foreign-jextract
 - 8254983: jextract fails to hande layout paths nested structs/union
   
   Reviewed-by: jvernee, sundar
 - Merge foreign-abi
 - Automatic merge of foreign-abi into foreign-jextract
 - 8254682: Close MemorySegments passed to upcalls after the upcall is done
   
   Reviewed-by: sundar
 - Automatic merge of foreign-abi into foreign-jextract
 - Automatic merge of foreign-abi into foreign-jextract
 - ... and 366 more: https://git.openjdk.java.net/panama-foreign/compare/66692532...9544b8e0

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

Changes:
  - all: https://git.openjdk.java.net/panama-foreign/pull/389/files
  - new: https://git.openjdk.java.net/panama-foreign/pull/389/files/66692532..9544b8e0

Webrevs:
 - full: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=389&range=01
 - incr: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=389&range=00-01

  Stats: 38172 lines in 210 files changed: 38165 ins; 0 del; 7 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/389.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/389/head:pull/389

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


More information about the panama-dev mailing list