[lworld] Integrated: Merge jdk
David Simms
dsimms at openjdk.java.net
Mon Aug 24 12:44:02 UTC 2020
On Mon, 24 Aug 2020 11:30:38 GMT, David Simms <dsimms at openjdk.org> wrote:
> Merge tag 'jdk-16+6' into lworld_merge_jdk_16_6
> Added tag jdk-16+6 for changeset 4a8fd81d64ba
>
> # Conflicts:
> # src/hotspot/cpu/aarch64/aarch64.ad
> # src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
> # src/hotspot/share/classfile/classFileParser.cpp
> # src/hotspot/share/runtime/globals.hpp
This pull request has now been integrated.
Changeset: a8215ec3
Author: David Simms <dsimms at openjdk.org>
URL: https://git.openjdk.java.net/valhalla/commit/a8215ec3
Stats: 10134 lines in 1959 files changed: 4358 ins; 3491 del; 2285 mod
Merge jdk
Merge 'jdk-16+6'
-------------
PR: https://git.openjdk.java.net/valhalla/pull/164
More information about the valhalla-dev
mailing list