[foreign-memaccess+abi] RFR: Merge master

J. Duke duke at openjdk.org
Mon Oct 23 12:05:59 UTC 2023


Hi all,

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

Over 46 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 +146:openjdk-bot-146
$ git checkout openjdk-bot-146

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


_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:
 - Merge
 - 8317807: JAVA_FLAGS removed from jtreg running in JDK-8317039
 - 8303525: Refactor/cleanup open/test/jdk/javax/rmi/ssl/SSLSocketParametersTest.java
 - 8318649: G1: Remove unimplemented HeapRegionRemSet::add_code_root_locked
 - 8318643: +UseTransparentHugePages must enable +UseLargePages
 - 8318082: ConcurrentModificationException from IndexWriter
 - 8318507: G1: Improve remset clearing for humongous candidates
 - 8318585: Rename CodeCache::UnloadingScope to UnlinkingScope
 - 8317868: Add @sealedGraph to MethodHandleDesc and descendants
 - 8318484: Initial version of cdsConfig.hpp
 - ... and 215 more: https://git.openjdk.org/panama-foreign/compare/ddda4722...25af5aea

The merge commit only contains trivial merges, so no merge-specific webrevs have been generated.

Changes: https://git.openjdk.org/panama-foreign/pull/913/files
  Stats: 29246 lines in 961 files changed: 18969 ins; 5728 del; 4549 mod
  Patch: https://git.openjdk.org/panama-foreign/pull/913.diff
  Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/913/head:pull/913

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


More information about the panama-dev mailing list