RFR: Merge jdk:master [v2]
J. Duke
duke at openjdk.org
Mon Dec 22 09:33:01 UTC 2025
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 129 commits from the branch `jdk:master`that can **not** be merged into the branch `master`:
>
> The following file contains merge conflicts:
>
> - src/hotspot/share/services/diagnosticCommand.cpp
>
> All Committers in this [project](https://openjdk.org/census#mobile) have access to my [personal fork](https://github.com/openjdk-bots/mobile) 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/mobile](https://github.com/openjdk/mobile) repository.
>
>
> # Ensure target branch is up to date
> $ git checkout master
> $ git pull https://github.com/openjdk/mobile.git master
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bots/mobile.git +11:openjdk-bot-11
> $ git checkout openjdk-bot-11
>
> # Merge the target branch
> $ git merge master
>
>
> 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 jdk: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/mobile.git openjdk-bot-11:11
>
>
> _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 130 commits:
- Merge jdk:master
- 8373876: StackWalkNativeToJava print more output in case of failures
Reviewed-by: dholmes, mdoerr
- 8346154: [XWayland] Some tests fail intermittently in the CI, but not locally
Reviewed-by: serb, prr
- 8369515: Deadlock between JVMTI and JNI ReleasePrimitiveArrayCritical
Co-authored-by: Richard Reingruber <rrich at openjdk.org>
Reviewed-by: rrich, fbredberg, pchilanomate
- 8374078: C2_MacroAssembler::verify_int_in_range has incorrect early return condition
Reviewed-by: kvn, dlong
- 8373946: Synth ProgressBarUI implementation confuses background painting with border painting
Reviewed-by: prr, kizune, azvegint
- 8373105: Test tools/jpackage/share/AsyncTest.java failed: problem running hdiutil
Reviewed-by: asemenyuk
- 8372564: Convert StringDedup to use Atomic<T>
Reviewed-by: tschatzl, aboldtch, iwalulya
- 8373793: TestDynamicStore.java '/manual' disables use of '/timeout'
Reviewed-by: weijun
- 8374048: Genshen: Backout fix for missed cancellation notice
Reviewed-by: kdnilsen, ysr
- ... and 120 more: https://git.openjdk.org/mobile/compare/327f940f...4aeb9d03
-------------
Changes: https://git.openjdk.org/mobile/pull/42/files
Webrev: https://webrevs.openjdk.org/?repo=mobile&pr=42&range=01
Stats: 18394 lines in 640 files changed: 11601 ins; 2654 del; 4139 mod
Patch: https://git.openjdk.org/mobile/pull/42.diff
Fetch: git fetch https://git.openjdk.org/mobile.git pull/42/head:pull/42
PR: https://git.openjdk.org/mobile/pull/42
More information about the mobile-dev
mailing list