[foreign-jextract] RFR: Merge foreign-abi

[Maurizio Cimadamore]

Wasn't expecting this - I'll take a look

Maurizio

On 06/05/2020 15:27, J.Duke wrote:
> 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:
>
> - test/jdk/java/jextract/smoke.h
>
> 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 +34:openjdk-bot-34
> $ git checkout openjdk-bot-34
>
> # 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-34:34
>
> _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
>
> -------------
>
> Commit messages:
>   - JDK-8244270: reorganize ABI-dependent layout constants (second attempt)
>
> The webrev contains the conflicts with foreign-jextract:
>   - merge conflicts: https://webrevs.openjdk.java.net/panama-foreign/149/webrev.00.conflicts
>
> Changes: https://git.openjdk.java.net/panama-foreign/pull/149/files
>    Stats: 1129 lines in 25 files changed: 309 ins; 700 del; 120 mod
>    Patch: https://git.openjdk.java.net/panama-foreign/pull/149.diff
>    Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/149/head:pull/149
>
> PR: https://git.openjdk.java.net/panama-foreign/pull/149