[foreign-abi] RFR: Merge foreign-memaccess [v2]
J.Duke
duke at openjdk.java.net
Fri Nov 6 11:45:58 UTC 2020
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 134 commits from the branch `foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:
>
> The following file contains merge conflicts:
>
> - test/micro/org/openjdk/bench/jdk/incubator/foreign/points/support/libJNIPoint.c
>
> 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 +70:openjdk-bot-70
> $ git checkout openjdk-bot-70
>
> # 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-70:70
>
> _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 135 commits:
- Merge branch 'foreign-abi' into 70
- Automatic merge of master into foreign-memaccess
- Automatic merge of jdk:master into master
- 8255563: Missing NULL checks after JDK-8233624
Reviewed-by: kvn
- 8241806: The sun/awt/shell/FileSystemViewMemoryLeak.java is unstable
Reviewed-by: jdv, aivanov
- 8255965: LogCompilation: add sort by nmethod code size
Reviewed-by: kvn, redestad
- 8255706: The JDWP debug agent unecessarily checks for JVMTI_ERROR_INTERRUPT after calling RawMonitorEnter
Reviewed-by: alanb, dholmes, sspitsyn
- 8255756: Disabling logging does unnecessary work
Reviewed-by: iklam
- 8255894: Remove unused StubRoutines::_zero_aligned_words
Reviewed-by: shade
- 8255955: Shenandoah: Only STW GC should process concurrent roots at pauses
Reviewed-by: rkennke
- ... and 125 more: https://git.openjdk.java.net/panama-foreign/compare/4b0e1067...95e8bc95
-------------
Changes: https://git.openjdk.java.net/panama-foreign/pull/388/files
Webrev: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=388&range=01
Stats: 14044 lines in 784 files changed: 7696 ins; 4023 del; 2325 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/388.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/388/head:pull/388
PR: https://git.openjdk.java.net/panama-foreign/pull/388
More information about the panama-dev
mailing list