[foreign-memaccess+abi] RFR: Merge master
J. Duke
duke at openjdk.org
Fri Jun 28 11:05:31 UTC 2024
Hi all,
this is an _automatically_ generated pull request to notify you that there are 96 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 +21:openjdk-bot-21
$ git checkout openjdk-bot-21
# 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-21:21
_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
- 8269657: Test java/nio/channels/DatagramChannel/Loopback.java failed: Unexpected message
- 8334433: jshell.exe runs an executable test.exe on startup
- 8335142: compiler/c1/TestTraceLinearScanLevel.java occasionally times out with -Xcomp
- 8335314: Problem list compiler/uncommontrap/DeoptReallocFailure.java
- 8319947: Recursive lightweight locking: s390x implementation
- 8334147: Shenandoah: Avoid taking lock for disabled free set logging
- 8334645: Un-problemlist vmTestbase/nsk/sysdict/vm/stress/chain/chain007/chain007.java
- 8334763: --enable-asan: assert(_thread->is_in_live_stack((address)this)) failed: not on stack?
- 8334843: RISC-V: Fix wraparound checking for r_array_index in lookup_secondary_supers_table_slow_path
- ... and 86 more: https://git.openjdk.org/panama-foreign/compare/334ed5a7...71171ccb
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.org/?repo=panama-foreign&pr=916&range=00.conflicts
Changes: https://git.openjdk.org/panama-foreign/pull/916/files
Stats: 9705 lines in 305 files changed: 6197 ins; 2209 del; 1299 mod
Patch: https://git.openjdk.org/panama-foreign/pull/916.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/916/head:pull/916
PR: https://git.openjdk.org/panama-foreign/pull/916
More information about the panama-dev
mailing list