[foreign-memaccess+abi] RFR: Merge master

J.Duke duke at openjdk.java.net
Fri Apr 16 11:07:16 UTC 2021


Hi all,

this is an _automatically_ generated pull request to notify you that there are 109 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:

The following file contains merge conflicts:

- src/hotspot/share/runtime/sharedRuntime.cpp

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+abi
$ git pull https://github.com/openjdk/panama-foreign.git foreign-memaccess+abi

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/panama-foreign.git +93:openjdk-bot-93
$ git checkout openjdk-bot-93

# Merge the target branch
$ git merge foreign-memaccess+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 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-93:93


_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
 - 8265330: G1: Fix comment in G1FullGCPrepareTask::G1CalculatePointersClosure
 - 8264987: G1: Fill BOTs for Survivor-turned-to-Old regions in full gc
 - 8265119: G1: update_remset_before_rebuild mixes liveness in words with liveness in bytes
 - 8264480: Unreachable code in nmethod.cpp inside #ifdef DEBUG
 - 8264104: Eliminate unnecessary vector mask conversion during VectorUnbox for floating point VectorMask
 - 8262108: SimpleDateFormat formatting broken for sq_MK Locale
 - 8265180: JvmtiCompiledMethodLoadEvent should include the stub section of nmethods
 - 8258794: Support for CLDR version 39
 - 8261301: StringWriter.flush() is NOOP but documentation does not indicate it
 - ... and 99 more: https://git.openjdk.java.net/panama-foreign/compare/546b8956...40c9f202

The webrev contains the conflicts with foreign-memaccess+abi:
 - merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=507&range=00.conflicts

Changes: https://git.openjdk.java.net/panama-foreign/pull/507/files
  Stats: 42870 lines in 1731 files changed: 10519 ins; 27840 del; 4511 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/507.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/507/head:pull/507

PR: https://git.openjdk.java.net/panama-foreign/pull/507


More information about the panama-dev mailing list