[foreign-abi] RFR: Merge foreign-memaccess [v2]
Jorn Vernee
jvernee at openjdk.java.net
Mon Jul 27 17:35:58 UTC 2020
On Mon, 27 Jul 2020 15:46:24 GMT, J. Duke <duke at openjdk.org> wrote:
>> Hi all,
>>
>> this is an _automatically_ generated pull request to notify you that there is 1 commit from the branch
>> `foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:
>> The following files contains merge conflicts:
>>
>> - src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
>> - src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/Utils.java
>> - test/micro/org/openjdk/bench/jdk/incubator/foreign/points/support/PanamaPoint.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-abi $ git pull https://github.com/openjdk/panama-foreign foreign-abi
>>
>> # Fetch and checkout the branch for this pull request
>> $ git fetch https://github.com/openjdk-bot/panama-foreign +47:openjdk-bot-47
>> $ git checkout openjdk-bot-47
>>
>> # 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 openjdk-bot-47:47
>>
>> _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
> four commits:
> - Fix NativeScope javadoc
> - All tests pass
> - Merge branch 'foreign-abi' into openjdk-bot-47
> - 8249879: Split MemorySegment and MemoryAddress
>
> Reviewed-by: henryjen, psandoz, jvernee
Marked as reviewed by jvernee (Committer).
-------------
PR: https://git.openjdk.java.net/panama-foreign/pull/266
More information about the panama-dev
mailing list