[foreign-memaccess+abi] RFR: Merge master

J.Duke duke at openjdk.java.net
Fri Nov 19 11:08:26 UTC 2021


Hi all,

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

The following file contains merge conflicts:

- src/hotspot/cpu/aarch64/sharedRuntime_aarch64.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 +106:openjdk-bot-106
$ git checkout openjdk-bot-106

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


_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
 - 8277449: compiler/vectorapi/TestLongVectorNeg.java fails with release VMs
 - 8277439: G1: Correct include guard name in G1EvacFailureObjectsSet.hpp
 - 8277371: Remove unnecessary DefNewGeneration::ref_processor_init()
 - 8277324: C2 compilation fails with "bad AD file" on x86-32 after JDK-8276162 due to missing match rule
 - 8273039: JShell crashes when naming variable or method "abstract" or "strictfp"
 - 8277213: CompileTask_lock is acquired out of order with MethodCompileQueue_lock
 - 8275643: C2's unaryOp vector intrinsic does not properly handle LongVector.neg
 - 8277102: Dubious PrintCompilation output
 - 8276976: Rename LIR_OprDesc to LIR_Opr
 - ... and 85 more: https://git.openjdk.java.net/panama-foreign/compare/4ae4c4ca...21d73270

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

Changes: https://git.openjdk.java.net/panama-foreign/pull/615/files
  Stats: 34811 lines in 553 files changed: 24287 ins; 5011 del; 5513 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/615.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/615/head:pull/615

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


More information about the panama-dev mailing list