[foreign-memaccess+abi] RFR: Merge master
J. Duke
duke at openjdk.org
Fri May 10 11:05:19 UTC 2024
Hi all,
this is an _automatically_ generated pull request to notify you that there are 84 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
The following file contains merge conflicts:
- .jcheck/conf
All Committers in this [project](https://openjdk.org/census#panama) have access to my [personal fork](https://github.com/openjdk-bots/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-bots/panama-foreign.git +20:openjdk-bot-20
$ git checkout openjdk-bot-20
# 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-bots/panama-foreign.git openjdk-bot-20:20
_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
- 8331744: java.lang.classfile.TypeKind improvements
- 8332006: Test com/sun/net/httpserver/TcpNoDelayNotRequired.java run timeout with -Xcomp
- 8331558: AArch64: optimize integer remainder
- 8330027: Identity hashes of archived objects must be based on a reproducible random seed
- 8331932: Startup regressions in 23-b13
- 8331905: Fix direct includes of g1_globals.hpp
- 8331908: Simplify log code in vectorintrinsics.cpp
- 8226990: GTK & Nimbus LAF: Tabbed pane's background color is not expected one when change the opaque checkbox.
- 8331942: On Linux aarch64, CDS archives should be using 64K alignment by default
- ... and 74 more: https://git.openjdk.org/panama-foreign/compare/386d6638...e06e6d41
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.org/?repo=panama-foreign&pr=915&range=00.conflicts
Changes: https://git.openjdk.org/panama-foreign/pull/915/files
Stats: 22411 lines in 485 files changed: 11932 ins; 7171 del; 3308 mod
Patch: https://git.openjdk.org/panama-foreign/pull/915.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/915/head:pull/915
PR: https://git.openjdk.org/panama-foreign/pull/915
More information about the panama-dev
mailing list