From duke at openjdk.org Tue Jun 10 16:26:03 2025 From: duke at openjdk.org (J. Duke) Date: Tue, 10 Jun 2025 16:26:03 GMT Subject: RFR: Merge jdk:master Message-ID: 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/hotspot/os/bsd/os_bsd.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 +8:openjdk-bot-8 $ git checkout openjdk-bot-8 # 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-8:8 _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: - 8358799: Refactor os::jvm_path() The webrev contains the conflicts with master: - merge conflicts: https://webrevs.openjdk.org/?repo=mobile&pr=36&range=00.conflicts Changes: https://git.openjdk.org/mobile/pull/36/files Stats: 300 lines in 4 files changed: 89 ins; 211 del; 0 mod Patch: https://git.openjdk.org/mobile/pull/36.diff Fetch: git fetch https://git.openjdk.org/mobile.git pull/36/head:pull/36 PR: https://git.openjdk.org/mobile/pull/36 From duke at openjdk.org Tue Jun 10 17:54:25 2025 From: duke at openjdk.org (J. Duke) Date: Tue, 10 Jun 2025 17:54:25 GMT Subject: RFR: Merge jdk:master [v2] In-Reply-To: References: Message-ID: > 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/hotspot/os/bsd/os_bsd.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 +8:openjdk-bot-8 > $ git checkout openjdk-bot-8 > > # 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-8:8 > > > _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 - 8358799: Refactor os::jvm_path() Reviewed-by: dholmes, jsjolen ------------- Changes: https://git.openjdk.org/mobile/pull/36/files Webrev: https://webrevs.openjdk.org/?repo=mobile&pr=36&range=01 Stats: 305 lines in 4 files changed: 89 ins; 216 del; 0 mod Patch: https://git.openjdk.org/mobile/pull/36.diff Fetch: git fetch https://git.openjdk.org/mobile.git pull/36/head:pull/36 PR: https://git.openjdk.org/mobile/pull/36 From duke at openjdk.org Tue Jun 10 17:54:26 2025 From: duke at openjdk.org (duke) Date: Tue, 10 Jun 2025 17:54:26 GMT Subject: RFR: Merge jdk:master In-Reply-To: References: Message-ID: On Tue, 10 Jun 2025 16:21:36 GMT, J. Duke wrote: > 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/hotspot/os/bsd/os_bsd.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 +8:openjdk-bot-8 > $ git checkout openjdk-bot-8 > > # 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-8:8 > > > _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 @openjdk[bot] Your change (at version 6646bfcaf92fc83794ec38fddb1df974dcb1775c) is now ready to be sponsored by a Committer. ------------- PR Comment: https://git.openjdk.org/mobile/pull/36#issuecomment-2960143421 From duke at openjdk.org Tue Jun 10 18:04:45 2025 From: duke at openjdk.org (J. Duke) Date: Tue, 10 Jun 2025 18:04:45 GMT Subject: Integrated: Merge jdk:master In-Reply-To: References: Message-ID: On Tue, 10 Jun 2025 16:21:36 GMT, J. Duke wrote: > 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/hotspot/os/bsd/os_bsd.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 +8:openjdk-bot-8 > $ git checkout openjdk-bot-8 > > # 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-8:8 > > > _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 This pull request has now been integrated. Changeset: 96d236fa Author: J. Duke Committer: Johan Vos URL: https://git.openjdk.org/mobile/commit/96d236fae1bd65bb175893ffb09f29c026717ab0 Stats: 305 lines in 4 files changed: 89 ins; 216 del; 0 mod Merge ------------- PR: https://git.openjdk.org/mobile/pull/36 From duke at openjdk.org Thu Jun 26 13:43:02 2025 From: duke at openjdk.org (J. Duke) Date: Thu, 26 Jun 2025 13:43:02 GMT Subject: RFR: Merge jdk:master Message-ID: 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 +9:openjdk-bot-9 $ git checkout openjdk-bot-9 # 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-9:9 _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: - 8359830: Incorrect os.version reported on macOS Tahoe 26 (Beta) The webrev contains the conflicts with master: - merge conflicts: https://webrevs.openjdk.org/?repo=mobile&pr=37&range=00.conflicts Changes: https://git.openjdk.org/mobile/pull/37/files Stats: 80 lines in 2 files changed: 41 ins; 13 del; 26 mod Patch: https://git.openjdk.org/mobile/pull/37.diff Fetch: git fetch https://git.openjdk.org/mobile.git pull/37/head:pull/37 PR: https://git.openjdk.org/mobile/pull/37