RFR: Merge jdk:master
J. Duke
duke at openjdk.org
Fri Apr 26 14:03:45 UTC 2024
Hi all,
this is an _automatically_ generated pull request to notify you that there are 352 commits from the branch `jdk:master`that can **not** be merged into the branch `master`:
The following files contains merge conflicts:
- make/autoconf/flags-cflags.m4
- make/autoconf/toolchain.m4
- make/common/JdkNativeCompilation.gmk
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 +4:openjdk-bot-4
$ git checkout openjdk-bot-4
# 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-4:4
_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:
- 8327247: C2 uses up to 2GB of RAM to compile complex string concat in extreme cases
- 8330625: Compilation memory statistic: prevent tearing of the final report
- 8331063: Some HttpClient tests don't report leaks
- 8329850: [AIX] Allow loading of different members of same shared library archive
- 8309881: Qualified name of a type element depends on its origin (source vs class)
- 8329862: libjli GetApplicationHome cleanups and enhance jli tracing
- 8331150: RISC-V: Fix "bad AD file" bug
- 8327512: JShell does not work correctly when a class named Object or Throwable is defined
- 8322847: java.lang.classfile.BufWriter should specify @throws for its writeXXX methods
- 8330181: Move PcDesc cache from nmethod header
- ... and 342 more: https://git.openjdk.org/mobile/compare/5ae849d6...5e2ced4b
The webrev contains the conflicts with master:
- merge conflicts: https://webrevs.openjdk.org/?repo=mobile&pr=24&range=00.conflicts
Changes: https://git.openjdk.org/mobile/pull/24/files
Stats: 97198 lines in 2569 files changed: 44478 ins; 40864 del; 11856 mod
Patch: https://git.openjdk.org/mobile/pull/24.diff
Fetch: git fetch https://git.openjdk.org/mobile.git pull/24/head:pull/24
PR: https://git.openjdk.org/mobile/pull/24
More information about the mobile-dev
mailing list