[foreign-memaccess+abi] RFR: Merge master

J. Duke duke at openjdk.org
Fri Mar 10 11:07:38 UTC 2023


Hi all,

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

Over 14 files contains merge conflicts.

All Committers in this [project](https://openjdk.org/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.org/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 +135:openjdk-bot-135
$ git checkout openjdk-bot-135

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


_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
 - 8294971: jdk.jlink jdk.tools.jimage.JImageTask is using ASM to verify classes
 - 8303822: gtestMain should give more helpful output
 - 8303624: The java.lang.Thread.FieldHolder can be null for JNI attaching threads
 - 8302360: Atomic*.compareAndExchange Javadoc unclear
 - 8302779: HelidonAppTest.java fails with "assert(_cb == CodeCache::find_blob(pc())) failed: Must be the same" or SIGSEGV
 - 8303691: Fedora based devkit build should load more packages from archive location
 - 8303924: ProblemList serviceability/sa/UniqueVtableTest.java on Linux
 - 8303609: ProblemList serviceability/sa/TestSysProps.java with ZGC
 - 8289765: JDI EventSet/resume/resume008 failed with "ERROR: suspendCounts don't match for : VirtualThread-unparker"
 - ... and 97 more: https://git.openjdk.org/panama-foreign/compare/b378aa7d...2693c967

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

Changes: https://git.openjdk.org/panama-foreign/pull/817/files
  Stats: 75547 lines in 1076 files changed: 63544 ins; 3704 del; 8299 mod
  Patch: https://git.openjdk.org/panama-foreign/pull/817.diff
  Fetch: git fetch https://git.openjdk.org/panama-foreign pull/817/head:pull/817

PR: https://git.openjdk.org/panama-foreign/pull/817


More information about the panama-dev mailing list