[foreign-abi] RFR: Merge foreign-memaccess [v2]
J.Duke
duke at openjdk.java.net
Fri Oct 9 12:14:00 UTC 2020
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 91 commits from the branch
> `foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:
> The following file contains merge conflicts:
>
> - src/hotspot/share/utilities/growableArray.hpp
>
> 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 +62:openjdk-bot-62
> $ git checkout openjdk-bot-62
>
> # 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-62:62
>
> _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
92 commits:
- Merge branch 'foreign-abi' into openjdk-bot-62
- Automatic merge of master into foreign-memaccess
- Automatic merge of jdk:master into master
- 8254285: G1: Remove "What is this about" comment in G1CollectedHeap.cpp
Reviewed-by: shade, sjohanss
- 8254175: Build no-pch configuration in debug mode for submit checks
Reviewed-by: rwestberg, erikj, dholmes
- 8253180: ZGC: Implementation of JEP 376: ZGC: Concurrent Thread-Stack Processing
Reviewed-by: stefank, pliden, rehn, neliasso, coleenp, smonteith
- 8233685: Test tools/javac/modules/AddLimitMods.java fails
Reviewed-by: vromero
- 8253965: Delete the outdated java.awt.PeerFixer class
Reviewed-by: prr, pbansal
- 8254190: [s390] interpreter misses exception check after calling monitorenter
Reviewed-by: shade, rrich
- 8254262: jdk.test.lib.Utils::createTemp* don't pass attrs
Reviewed-by: shade
- ... and 82 more: https://git.openjdk.java.net/panama-foreign/compare/89c13c58...c8c60657
-------------
Changes: https://git.openjdk.java.net/panama-foreign/pull/376/files
Webrev: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=376&range=01
Stats: 23117 lines in 613 files changed: 12743 ins; 6174 del; 4200 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/376.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/376/head:pull/376
PR: https://git.openjdk.java.net/panama-foreign/pull/376
More information about the panama-dev
mailing list