[foreign-jextract] [Rev 01] RFR: Merge foreign-abi

J.Duke duke at openjdk.java.net
Fri May 8 07:51:09 UTC 2020


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there is 1 commit from the branch
> `foreign-abi`that can **not** be merged into the branch `foreign-jextract`:
> The following file contains merge conflicts:
> 
> - src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryLayouts.java
> 
> All Committers in this [project](https://openjdk.java.net/census#Optional[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 foreign-jextract
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign +33:openjdk-bot-33
> $ git checkout openjdk-bot-33
> 
> # 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 openjdk-bot-33:33
> 
> _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.

This pull request has now been integrated.

Changeset: 50e5acd7
Author:    Maurizio Cimadamore <mcimadamore at openjdk.org>
URL:       https://git.openjdk.java.net/panama-foreign/commit/50e5acd7
Stats:     1129 lines in 25 files changed: 700 ins; 309 del; 120 mod

JDK-8244270: reorganize ABI-dependent layout constants (second attempt)

Reviewed-by: sundar

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

Changes:
  - all: https://git.openjdk.java.net/panama-foreign/pull/148/files
  - new: https://git.openjdk.java.net/panama-foreign/pull/148/files/50e5acd7..50e5acd7

Webrevs:
 - full: https://webrevs.openjdk.java.net/panama-foreign/148/webrev.01
 - incr: https://webrevs.openjdk.java.net/panama-foreign/148/webrev.00-01

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

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


More information about the panama-dev mailing list