[foreign-memaccess+abi] RFR: Merge master

J. Duke duke at openjdk.org
Fri Sep 22 11:08:26 UTC 2023


Hi all,

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

The following file contains merge conflicts:

- make/test/BuildMicrobenchmark.gmk

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

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


_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
 - 8316681: Rewrite URLEncoder.encode to use small reusable buffers
 - 8316702: Only evaluate buffer when IGVPrintLevelOption >= 5
 - 8316130: Incorrect control in LibraryCallKit::inline_native_notify_jvmti_funcs
 - 8316418: containers/docker/TestMemoryWithCgroupV1.java get OOM killed with Parallel GC
 - 8315576: compiler/codecache/CodeCacheFullCountTest.java fails after JDK-8314837
 - 8316319: Generational ZGC: The SoftMaxHeapSize might be wrong when CDS decreases the MaxHeapSize
 - 8316699: TestDynamicConstant.java fails with release VMs
 - 8316698: build failure caused by JDK-8316456
 - 8316456: StackWalker may skip Continuation::yield0 frame mistakenly
 - ... and 100 more: https://git.openjdk.org/panama-foreign/compare/2fbd4bab...94ae2198

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

Changes: https://git.openjdk.org/panama-foreign/pull/887/files
  Stats: 26532 lines in 433 files changed: 13932 ins; 10336 del; 2264 mod
  Patch: https://git.openjdk.org/panama-foreign/pull/887.diff
  Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/887/head:pull/887

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


More information about the panama-dev mailing list