[foreign-memaccess] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri Nov 20 11:06:19 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
-------------
Commit messages:
- Automatic merge of jdk:master into master
- 8255526: Enable jcheck whitespace checking of build system files
- 8256393: Github Actions build on Linux should define OS and GCC versions
- 8250888: nsk/jvmti/scenarios/general_functions/GF08/gf08t001/TestDriver.java fails
- 8255885: Metaspace: freelist commit counter is not updated when purging
- 8256594: Unexpected warning: SIGSEGV handler flags expected:SA_RESTART|SA_SIGINFO found:SA_RESTART|SA_SIGINFO
- 8256108: Create implementation for NSAccessibilityElement protocol peer
- 8251317: Support for CLDR version 38
- 4916923: In MetalRootPaneUI, MetalRootLayout does not correctly calculate minimumsize
- 8256640: assert(!m->is_old() || ik()->is_being_redefined()) failed: old methods should not be in vtable
- ... and 96 more: https://git.openjdk.java.net/panama-foreign/compare/fcfeafad...e27fef1f
The webrev contains the conflicts with foreign-memaccess:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=398&range=00.conflicts
Changes: https://git.openjdk.java.net/panama-foreign/pull/398/files
Stats: 109507 lines in 664 files changed: 51871 ins; 44797 del; 12839 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