RFR: Merge jdk:master
duke at openjdk.java.net
Sat Nov 21 03:05:38 UTC 2020
this is an _automatically_ generated pull request to notify you that there are 33 commits from the branch `jdk:master`that can **not** be merged into the branch `master`:
The following file contains merge conflicts:
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 +6:openjdk-bot-6
$ git checkout openjdk-bot-6
# 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-6:6
_Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly.
- 8255934: JConsole 14 and greater fails to connect to older JVM
- 8256806: Shenandoah: optimize shenandoah/jni/TestPinnedGarbage.java test
- 8256073: Improve vector rematerialization support
- 8255367: C2: Deoptimization during vector box construction is broken
- 8256061: RegisterSaver::save_live_registers() omits upper halves of ZMM0-15 registers
- 8256056: Deoptimization stub doesn't save vector registers on x86
- 8256058: Improve vector register handling in RegisterMap::pd_location() on x86
- 8256183: InputStream.skipNBytes is missing @since 12
- 8256507: Add a micro benchmark for JDK-8153005
- 8255908: ExceptionInInitializerError due to UncheckedIOException while initializing cgroupv1 subsystem
- ... and 23 more: https://git.openjdk.java.net/lanai/compare/68138893...14de791d
The webrev contains the conflicts with master:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=lanai&pr=131&range=00.conflicts
Stats: 1548 lines in 80 files changed: 857 ins; 407 del; 284 mod
Fetch: git fetch https://git.openjdk.java.net/lanai pull/131/head:pull/131
More information about the lanai-dev