[foreign-abi] Integrated: Merge foreign-memaccess
J.Duke
duke at openjdk.java.net
Wed Oct 28 12:24:58 UTC 2020
On Fri, 23 Oct 2020 11:01:09 GMT, J. Duke <duke at openjdk.org> wrote:
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 149 commits from the branch `foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:
>
> The following files contains merge conflicts:
>
> - src/hotspot/share/c1/c1_IR.hpp
> - src/hotspot/share/code/pcDesc.hpp
> - src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
> - src/hotspot/share/opto/compile.cpp
> - src/hotspot/share/opto/output.cpp
>
> 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-abi
> $ git pull https://github.com/openjdk/panama-foreign.git foreign-abi
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign.git +67:openjdk-bot-67
> $ git checkout openjdk-bot-67
>
> # Merge the target branch
> $ git merge foreign-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 foreign-memaccess'
>
>
> 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-67:67
>
> _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
This pull request has now been integrated.
Changeset: caa058ca
Author: J. Duke <duke at openjdk.org>
Committer: Maurizio Cimadamore <mcimadamore at openjdk.org>
URL: https://git.openjdk.java.net/panama-foreign/commit/caa058ca
Stats: 64476 lines in 855 files changed: 48356 ins; 12262 del; 3858 mod
Merge foreign-memaccess
-------------
PR: https://git.openjdk.java.net/panama-foreign/pull/385
More information about the panama-dev
mailing list