[foreign-memaccess] RFR: Merge master [v2]
J.Duke
duke at openjdk.java.net
Fri Nov 20 17:50:38 UTC 2020
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 106 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess`:
>
> The following file contains merge conflicts:
>
> - src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/HeapMemorySegmentImpl.java
>
> 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-memaccess
> $ git pull https://github.com/openjdk/panama-foreign.git foreign-memaccess
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign.git +75:openjdk-bot-75
> $ git checkout openjdk-bot-75
>
> # Merge the target branch
> $ git merge foreign-memaccess
>
> 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 master'
>
>
> 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-75:75
>
> _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 107 commits:
- Merge master
- Automatic merge of jdk:master into master
- 8255526: Enable jcheck whitespace checking of build system files
Reviewed-by: shade, erikj
- 8256393: Github Actions build on Linux should define OS and GCC versions
Reviewed-by: shade, erikj, ihse
- 8250888: nsk/jvmti/scenarios/general_functions/GF08/gf08t001/TestDriver.java fails
Reviewed-by: cjplummer, sspitsyn
- 8255885: Metaspace: freelist commit counter is not updated when purging
Reviewed-by: coleenp, iklam
- 8256594: Unexpected warning: SIGSEGV handler flags expected:SA_RESTART|SA_SIGINFO found:SA_RESTART|SA_SIGINFO
Reviewed-by: stuefe, coleenp, dcubed
- 8256108: Create implementation for NSAccessibilityElement protocol peer
Reviewed-by: serb
- 8251317: Support for CLDR version 38
Reviewed-by: erikj, bchristi, joehw
- 4916923: In MetalRootPaneUI, MetalRootLayout does not correctly calculate minimumsize
Reviewed-by: shade
- ... and 97 more: https://git.openjdk.java.net/panama-foreign/compare/b2012d89...a9d016de
-------------
Changes: https://git.openjdk.java.net/panama-foreign/pull/398/files
Webrev: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=398&range=01
Stats: 109514 lines in 664 files changed: 51871 ins; 44797 del; 12846 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/398.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/398/head:pull/398
PR: https://git.openjdk.java.net/panama-foreign/pull/398
More information about the panama-dev
mailing list