[foreign-memaccess+abi] RFR: Merge master

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


Hi all,

this is an _automatically_ generated pull request to notify you that there are 99 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/frame.inline.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-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 +92:openjdk-bot-92
$ git checkout openjdk-bot-92

# 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-92:92

_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
 - 8264109: Add vectorized implementation for VectorMask.andNot()
 - 8264409: AArch64: generate better code for Vector API allTrue
 - 8264502: (fc) FileDispatcherImpl.setDirect0 might return uninitialized variable on some platforms
 - 8264526: javax/swing/text/html/parser/Parser/8078268/bug8078268.java timeout
 - 8205502: Make exception message from AnnotationInvocationHandler more informative
 - 8262046: Clean up parallel class loading code and comments
 - 8264403: [macos]: App names containing '.' characters results in an error message when launching
 - 8264609: Number.{byteValue, shortValue} spec should use @implSpec
 - 8264285: Clean the modification of ccstr JVM flags
 - ... and 89 more: https://git.openjdk.java.net/panama-foreign/compare/e53f2b24...106de799

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

Changes: https://git.openjdk.java.net/panama-foreign/pull/488/files
  Stats: 10159 lines in 441 files changed: 6671 ins; 1238 del; 2250 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/488.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/488/head:pull/488

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


More information about the panama-dev mailing list