RFR: Merge jdk:master [v2]

J. Duke duke at openjdk.org
Fri Feb 17 18:41:44 UTC 2023


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 3910 commits from the branch `jdk:master`that can **not** be merged into the branch `master`:
> 
> The following files contains merge conflicts:
> 
> - make/autoconf/build-aux/config.sub
> - make/autoconf/toolchain.m4
> - make/modules/java.base/lib/CoreLibraries.gmk
> 
> All Committers in this [project](https://openjdk.org/census#mobile) have access to my [personal fork](https://github.com/openjdk-bot/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-bot/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-bot/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 3911 commits:

 - Merge jdk:master
 - 8302167: Avoid allocating register in fast_lock()
   
   Reviewed-by: kvn, kdnilsen
 - 8278965: crash in SymbolTable::do_lookup
   
   Reviewed-by: dholmes, fparain, iklam
 - 8301480: Replace NULL with nullptr in os/posix
   
   Reviewed-by: coleenp, dholmes
 - 8301224: Replace NULL with nullptr in share/gc/shared/
   
   Reviewed-by: stefank, kbarrett
 - 8301578: Perform output outside synchronization in Module.class
   
   Reviewed-by: alanb
 - 8302004: InlineTree should consult replay file in release build
   
   Reviewed-by: phh, xliu
 - 8301072: Replace NULL with nullptr in share/oops/
   
   Reviewed-by: stefank, coleenp, dholmes
 - 8302069: javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java update
   
   Reviewed-by: cjplummer, amenkov
 - 8302125: Make G1 full gc abort the VM after failing VerifyDuringGC verification
   
   Reviewed-by: ayang, iwalulya
 - ... and 3901 more: https://git.openjdk.org/mobile/compare/fc49f94f...e80b9ae2

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

Changes: https://git.openjdk.org/mobile/pull/16/files
 Webrev: https://webrevs.openjdk.org/?repo=mobile&pr=16&range=01
  Stats: 1157692 lines in 14366 files changed: 653201 ins; 350605 del; 153886 mod
  Patch: https://git.openjdk.org/mobile/pull/16.diff
  Fetch: git fetch https://git.openjdk.org/mobile pull/16/head:pull/16

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


More information about the mobile-dev mailing list