[lworld] Integrated: Merge jdk

David Simms dsimms at openjdk.java.net
Thu Feb 18 09:52:37 UTC 2021


On Thu, 18 Feb 2021 08:20:33 GMT, David Simms <dsimms at openjdk.org> wrote:

> Merge tag 'jdk-17+10'
> # Conflicts:
> #	src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp
> #	src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
> #	src/hotspot/share/memory/archiveBuilder.cpp
> #	src/hotspot/share/oops/instanceKlass.hpp
> #	src/hotspot/share/oops/typeArrayKlass.hpp
> #	src/hotspot/share/runtime/sharedRuntime.cpp
> #	test/hotspot/jtreg/ProblemList.txt

This pull request has now been integrated.

Changeset: e31335fa
Author:    David Simms <dsimms at openjdk.org>
URL:       https://git.openjdk.java.net/valhalla/commit/e31335fa
Stats:     9363 lines in 376 files changed: 4632 ins; 2645 del; 2086 mod

Merge jdk

Merge tag 'jdk-17+10'

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

PR: https://git.openjdk.java.net/valhalla/pull/339


More information about the valhalla-dev mailing list