[foreign-memaccess+abi] RFR: Merge master

J.Duke duke at openjdk.java.net
Fri Dec 10 11:11:15 UTC 2021


Hi all,

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

The following file contains merge conflicts:

- src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryAddress.java

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 +110:openjdk-bot-110
$ git checkout openjdk-bot-110

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


_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
 - 8277634: Incorrect method name in invokedynamic
 - 8278532: Fix some typos in compiler comments
 - 8277997: Intrinsic creation for VectorMask.fromLong API
 - 8277807: Increase default initial concurrent refinement threshold
 - Merge
 - 8278521: ProblemList java/lang/management/ThreadMXBean/ThreadLists.java
 - 8278516: Typos in snippet for java.compiler
 - 8278185: Custom JRE cannot find non-ASCII named module inside
 - 8278421: G1: Remove unused HeapRegion::verify
 - ... and 116 more: https://git.openjdk.java.net/panama-foreign/compare/79cda8ef...be995f06

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

Changes: https://git.openjdk.java.net/panama-foreign/pull/626/files
  Stats: 19282 lines in 793 files changed: 13144 ins; 2644 del; 3494 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/626.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/626/head:pull/626

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


More information about the panama-dev mailing list