RFR: Merge jdk:master [v2]

J.Duke duke at openjdk.java.net
Thu Feb 4 06:30:07 UTC 2021

> Hi all,
> this is an _automatically_ generated pull request to notify you that there are 30 commits from the branch `jdk:master`that can **not** be merged into the branch `master`:
> The following file contains merge conflicts:
> - make/modules/java.desktop/lib/Awt2dLibraries.gmk
> All Committers in this [project](https://openjdk.java.net/census#lanai) have access to my [personal fork](https://github.com/openjdk-bot/lanai) 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.java.net/display/skara#Skara-Personalforks) of the [openjdk/lanai](https://github.com/openjdk/lanai) repository.
> # Ensure target branch is up to date
> $ git checkout master
> $ git pull https://github.com/openjdk/lanai.git master
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/lanai.git +7:openjdk-bot-7
> $ git checkout openjdk-bot-7
> # 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/lanai.git openjdk-bot-7:7
> _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 31 commits:

 - Merge jdk:master
 - Merge
 - 8259794: Remove EA from JDK 16 version string starting with Initial RC promotion on Feb 04, 2021(B35)
   Reviewed-by: iignatyev, mikael
 - 8260704: ParallelGC: oldgen expansion needs release-store for _end
   Move JDK-8257999 barrier to correct location.
   Reviewed-by: tschatzl, sjohanss
 - 8260927: StringBuilder::insert is incorrect without Compact Strings
   Reviewed-by: redestad, alanb, rriggs, jlaskey
 - 8258378: Final nroff manpage update for JDK 16
   Reviewed-by: erikj, dholmes
 - 8257215: JFR: Events dropped when streaming over a chunk rotation
   Reviewed-by: mgronlun
 - 8260473: [vector] ZGC: VectorReshape test produces incorrect results with ZGC enabled
   Co-authored-by: Stuart Monteith <smonteith at openjdk.org>
   Co-authored-by: Wang Chao <casparcwang at tencent.com>
   Reviewed-by: vlivanov, neliasso
 - 8260632: Build failures after JDK-8253353
   Reviewed-by: stuefe, thartmann, kvn
 - 8260339: JVM crashes when executing PhaseIdealLoop::match_fill_loop
   Co-authored-by: He Xuejin <hexuejin2 at huawei.com>
   Reviewed-by: neliasso, kvn, iignatyev
 - ... and 21 more: https://git.openjdk.java.net/lanai/compare/30b87c95...d56e6d62


Changes: https://git.openjdk.java.net/lanai/pull/172/files
 Webrev: https://webrevs.openjdk.java.net/?repo=lanai&pr=172&range=01
  Stats: 5673 lines in 180 files changed: 3963 ins; 1149 del; 561 mod
  Patch: https://git.openjdk.java.net/lanai/pull/172.diff
  Fetch: git fetch https://git.openjdk.java.net/lanai pull/172/head:pull/172

PR: https://git.openjdk.java.net/lanai/pull/172

More information about the lanai-dev mailing list