[foreign-memaccess] RFR: Merge master
Maurizio Cimadamore
maurizio.cimadamore at oracle.com
Wed May 27 13:12:59 UTC 2020
I will take care of this
Maurizio
On 27/05/2020 13:27, J.Duke wrote:
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 54 commits from the branch `master`that
> can **not** be merged into the branch `foreign-memaccess`:
>
> Over 40 files contains merge conflicts.
>
> 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-memaccess
> $ git pull https://github.com/openjdk/panama-foreign foreign-memaccess
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign +38:openjdk-bot-38
> $ git checkout openjdk-bot-38
>
> # 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 openjdk-bot-38:38
>
> _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:
> - Merge remote-tracking branch 'remotes/jdk/master'
> - 8245179: JvmciNotifyBootstrapFinishedEventTest.java fails with custom Tiered Level set externally
> - 8245801: StressRecompilation triggers assert "redundunt OSR recompilation detected. memory leak in CodeCache!"
> - 8245756: Reduce bootstrap cost of StringConcatFactory prependers
> - 8245724: Move g1 periodic gc logging to G1InitLogger
> - 8245723: Remove PrintCompressedOopsMode and change gc+heap+coops info log to debug level
> - 8245812: Shenandoah: compute root phase parallelism
> - 8243339: AArch64: Obsolete UseBarriersForVolatile option
> - 8245392: Remove duplication in class redefinition and retransformation specs
> - 8228692: BitMap::reallocate might not clear some bits
> - ... and 44 more: https://git.openjdk.java.net/panama-foreign/compare/046af8c2...a6ce2a93
>
> The webrev contains the conflicts with foreign-memaccess:
> - merge conflicts: https://webrevs.openjdk.java.net/panama-foreign/183/webrev.00.conflicts
>
> Changes: https://git.openjdk.java.net/panama-foreign/pull/183/files
> Stats: 76320 lines in 398 files changed: 11643 ins; 62971 del; 1706 mod
> Patch: https://git.openjdk.java.net/panama-foreign/pull/183.diff
> Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/183/head:pull/183
>
> PR: https://git.openjdk.java.net/panama-foreign/pull/183
More information about the panama-dev
mailing list