[foreign-memaccess+abi] RFR: Merge master
J. Duke
duke at openjdk.org
Fri Aug 11 11:28:32 UTC 2023
Hi all,
this is an _automatically_ generated pull request to notify you that there are 77 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
The following file contains merge conflicts:
- src/java.base/share/classes/java/lang/foreign/SegmentAllocator.java
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 +140:openjdk-bot-140
$ git checkout openjdk-bot-140
# 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-140:140
_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
- 8311648: Refactor the Arena/Chunk/ChunkPool interface
- 8313224: Avoid calling JavaThread::current() in MemAllocator::Allocation constructor
- 8312461: JNI warnings in SunMSCApi provider
- 8312882: Update the CONTRIBUTING.md with pointers to lifecycle of a PR
- 8304292: Memory leak related to ClassLoader::update_class_path_entry_list
- 8313899: JVMCI exception Translation can fail in TranslatedException.<clinit>
- 8313633: [macOS] java/awt/dnd/NextDropActionTest/NextDropActionTest.java fails with java.lang.RuntimeException: wrong next drop action!
- 8312259: StatusResponseManager unused code clean up
- 8314061: [JVMCI] DeoptimizeALot stress logic breaks deferred barriers
- ... and 67 more: https://git.openjdk.org/panama-foreign/compare/780ca6ff...fe8840b0
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.org/?repo=panama-foreign&pr=861&range=00.conflicts
Changes: https://git.openjdk.org/panama-foreign/pull/861/files
Stats: 12415 lines in 615 files changed: 4485 ins; 3948 del; 3982 mod
Patch: https://git.openjdk.org/panama-foreign/pull/861.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/861/head:pull/861
PR: https://git.openjdk.org/panama-foreign/pull/861
More information about the panama-dev
mailing list