[foreign-memaccess+abi] RFR: Merge master [v2]
J. Duke
duke at openjdk.org
Fri Dec 20 14:26:38 UTC 2024
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 87 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 +22:openjdk-bot-22
> $ git checkout openjdk-bot-22
>
> # 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-22:22
>
>
> _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
J. Duke has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 88 commits:
- Merge branch 'foreign-memaccess+abi' into 22
- Automatic merge of jdk:master into master
- 8346667: Doccheck: warning about missing </span> before <h2>
Reviewed-by: psandoz
- 8346128: Comparison build fails due to difference in LabelTarget.html
Reviewed-by: jlahoda, liach, prappo
- 8322983: Virtual Threads: exclude 2 tests
Reviewed-by: jpai, lmesnik, syan
- 8346605: AIX fastdebug build fails in memoryReserver.cpp after JDK-8345655
Reviewed-by: stefank, lucy, mdoerr
- 8331467: FileSystems.getDefault fails with ClassNotFoundException if custom default provider is in run-time image
Reviewed-by: alanb, jpai
- 8346106: Verify.checkEQ: testing utility for recursive value verification
Reviewed-by: kvn, tweidmann
- 8340493: Fix some Asserts failure messages
Reviewed-by: valeriep, djelinski
- 8346576: Remove vmTestbase/gc/memory/Nio/Nio.java from test/hotspot/jtreg/ProblemList.txt
Reviewed-by: alanb, jpai, mli
- ... and 78 more: https://git.openjdk.org/panama-foreign/compare/e2397225...0d1c1205
-------------
Changes: https://git.openjdk.org/panama-foreign/pull/917/files
Webrev: https://webrevs.openjdk.org/?repo=panama-foreign&pr=917&range=01
Stats: 14391 lines in 506 files changed: 10457 ins; 2235 del; 1699 mod
Patch: https://git.openjdk.org/panama-foreign/pull/917.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/917/head:pull/917
PR: https://git.openjdk.org/panama-foreign/pull/917
More information about the panama-dev
mailing list