[lworld] Integrated: Merge jdk

David Simms dsimms at openjdk.java.net
Thu Aug 26 10:04:20 UTC 2021


On Thu, 26 Aug 2021 08:38:44 GMT, David Simms <dsimms at openjdk.org> wrote:

> Merge tag 'jdk-18+12'
> 
> # Conflicts:
> #	src/hotspot/share/gc/shared/barrierSet.hpp
> #	src/hotspot/share/oops/access.hpp
> #	src/hotspot/share/oops/access.inline.hpp
> #	src/hotspot/share/oops/accessBackend.hpp
> #	src/hotspot/share/oops/markWord.hpp

This pull request has now been integrated.

Changeset: 994f6cfe
Author:    David Simms <dsimms at openjdk.org>
URL:       https://git.openjdk.java.net/valhalla/commit/994f6cfe5a81873adc13c52cabc335da42647d5d
Stats:     5897 lines in 214 files changed: 4151 ins; 1028 del; 718 mod

Merge jdk

Merge tag 'jdk-18+12'

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

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


More information about the valhalla-dev mailing list