[lworld] Integrated: Merge jdk
David Simms
dsimms at openjdk.java.net
Thu Oct 1 10:18:42 UTC 2020
On Thu, 1 Oct 2020 10:06:39 GMT, David Simms <dsimms at openjdk.org> wrote:
> Merge tag 'jdk-16+18' into lworld_merge_jdk_16_18
> Added tag jdk-16+18 for changeset e5ba020e
>
> # Conflicts:
> # src/hotspot/share/gc/shared/memAllocator.cpp
> # src/hotspot/share/oops/accessBackend.hpp
> # src/hotspot/share/oops/oop.inline.hpp
> # src/hotspot/share/opto/compile.cpp
> # src/hotspot/share/opto/compile.hpp
This pull request has now been integrated.
Changeset: d248d383
Author: David Simms <dsimms at openjdk.org>
URL: https://git.openjdk.java.net/valhalla/commit/d248d383
Stats: 35531 lines in 2077 files changed: 7112 ins; 23255 del; 5164 mod
Merge jdk
Merge tag 'jdk-16+18'
-------------
PR: https://git.openjdk.java.net/valhalla/pull/204
More information about the valhalla-dev
mailing list