[foreign-memaccess+abi] RFR: Merge master
J. Duke
duke at openjdk.org
Fri Oct 13 12:22:24 UTC 2023
Hi all,
this is an _automatically_ generated pull request to notify you that there are 83 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
Over 33 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 +145:openjdk-bot-145
$ git checkout openjdk-bot-145
# 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-145:145
_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
- 8318006: remove unused net related coding
- 8315026: ProcessHandle implementation listing processes on AIX should use getprocs64
- 8317677: Specialize Vtablestubs::entry_for() for VtableBlob
- 8317919: pthread_attr_init handle return value and destroy pthread_attr_t object
- 8317959: Check return values of malloc in native java.base coding
- 8317987: C2 recompilations cause high memory footprint
- 8316464: 3 sun/tools tests ignore VM flags
- 8317818: Combinatorial explosion during 'this' escape analysis
- 8315484: java/awt/dnd/RejectDragDropActionTest.java timed out
- ... and 73 more: https://git.openjdk.org/panama-foreign/compare/ddda4722...13b96ddd
The merge commit only contains trivial merges, so no merge-specific webrevs have been generated.
Changes: https://git.openjdk.org/panama-foreign/pull/911/files
Stats: 13171 lines in 461 files changed: 7618 ins; 3358 del; 2195 mod
Patch: https://git.openjdk.org/panama-foreign/pull/911.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/911/head:pull/911
PR: https://git.openjdk.org/panama-foreign/pull/911
More information about the panama-dev
mailing list