[foreign-memaccess+abi] RFR: Merge master
J. Duke
duke at openjdk.org
Fri Dec 9 11:10:02 UTC 2022
Hi all,
this is an _automatically_ generated pull request to notify you that there are 136 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
Over 180 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 +130:openjdk-bot-130
$ git checkout openjdk-bot-130
# 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-130:130
_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
- 8297778: Modernize and improve module jdk.sctp
- 8257197: Add additional verification code to PhaseCCP
- 8297679: InvocationTargetException field named target is not declared final
- 8298083: The "CheckBox/RadioButton[Enabled/Disabled].textForeground" stoped working
- 8298138: Shenandoah: HdrSeq asserts "sub-bucket index (512) overflow for value ( 1.00)"
- 8292289: [vectorapi] Improve the implementation of VectorTestNode
- 8297295: Remove ThreadGroup.allowThreadSuspension
- 8296149: Start of release updates for JDK 21
- 8297642: PhaseIdealLoop::only_has_infinite_loops must detect all loops that never lead to termination
- ... and 126 more: https://git.openjdk.org/panama-foreign/compare/5c5fa74a...8cefa3d2
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.org/?repo=panama-foreign&pr=757&range=00.conflicts
Changes: https://git.openjdk.org/panama-foreign/pull/757/files
Stats: 41711 lines in 1003 files changed: 25265 ins; 10077 del; 6369 mod
Patch: https://git.openjdk.org/panama-foreign/pull/757.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign pull/757/head:pull/757
PR: https://git.openjdk.org/panama-foreign/pull/757
More information about the panama-dev
mailing list