RFR: Merge jdk:master [v2]

J. Duke duke at openjdk.org
Mon Dec 22 08:14:47 UTC 2025


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there is 1 commit from the branch `jdk:master`that can **not** be merged into the branch `master`:
> 
> The following file contains merge conflicts:
> 
> - src/java.base/macosx/native/libjava/java_props_macosx.c
> 
> 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 +10:openjdk-bot-10
> $ git checkout openjdk-bot-10
> 
> # 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-10:10
> 
> 
> _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 two commits:

 - Merge jdk:master
 - 8373517: Revert the macos Tahoe specific change done in JDK-8359830
   
   Reviewed-by: rriggs, bpb

-------------

Changes: https://git.openjdk.org/mobile/pull/41/files
  Webrev: https://webrevs.openjdk.org/?repo=mobile&pr=41&range=01
  Stats: 34 lines in 1 file changed: 0 ins; 18 del; 16 mod
  Patch: https://git.openjdk.org/mobile/pull/41.diff
  Fetch: git fetch https://git.openjdk.org/mobile.git pull/41/head:pull/41

PR: https://git.openjdk.org/mobile/pull/41


More information about the mobile-dev mailing list