[foreign-memaccess+abi] RFR: Merge master
J. Duke
duke at openjdk.org
Fri Apr 28 11:20:57 UTC 2023
Hi all,
this is an _automatically_ generated pull request to notify you that there are 113 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
Over 35 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 +138:openjdk-bot-138
$ git checkout openjdk-bot-138
# 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-138:138
_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
- 8305387: JDK-8301995 breaks arm 32-bit
- 8307006: ProblemList gtest/NMTGtest.java on aix
- 8305079: Remove finalize() from compiler/c2/Test719030
- 8306696: Remove MetaspaceReclaimPolicy=aggressive and obsolete MetaspaceReclaimPolicy
- 8306901: Macro offset_of confuses Eclipse CDT
- 8305566: Change StringDedup thread to derive from JavaThread
- 8306711: Improve diagnosis of `IntlTest` framework
- 8298993: (process) java/lang/ProcessBuilder/UnblockSignals.java fails
- 8306952: improve generic signature of internal DCInlineTag class
- ... and 103 more: https://git.openjdk.org/panama-foreign/compare/fae4c90a...4bac46db
The merge commit only contains trivial merges, so no merge-specific webrevs have been generated.
Changes: https://git.openjdk.org/panama-foreign/pull/829/files
Stats: 44908 lines in 789 files changed: 28726 ins; 11588 del; 4594 mod
Patch: https://git.openjdk.org/panama-foreign/pull/829.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/829/head:pull/829
PR: https://git.openjdk.org/panama-foreign/pull/829
More information about the panama-dev
mailing list