[crac] RFR: Merge jdk:jdk-27+7
Radim Vansa
rvansa at openjdk.org
Wed Feb 4 11:49:09 UTC 2026
On Tue, 3 Feb 2026 14:49:43 GMT, Timofei Pushkin <tpushkin at openjdk.org> wrote:
> Merge of mainline up to tag `jdk-27+7`.
>
> Essentially clean, the only conflict was in copyright years. Output of `git show --remerge-diff`:
>
> diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
> remerge CONFLICT (content): Merge conflict in src/hotspot/share/gc/parallel/psParallelCompact.cpp
> index 40fea755cf7..27f1c7a8afb 100644
> --- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
> +++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
> @@ -1,12 +1,6 @@
> /*
> -<<<<<<< 2f0af59e4d3 (Merge jdk:jdk-27+5)
> - * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
> - * Copyright (c) 2019, 2021, Azul Systems, Inc. All rights reserved.
> -||||||| f6d26c6b32a
> - * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
> -=======
> * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
> ->>>>>>> 62c7e9aefd4 (8376423: Test javax/swing/plaf/metal/MetalUtils/bug6190373.java failed: ClassCastException: class java.lang.Character cannot be cast to class javax.swing.Painter)
> + * Copyright (c) 2019, 2021, Azul Systems, Inc. All rights reserved.
> * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
> *
> * This code is free software; you can redistribute it and/or modify it
Marked as reviewed by rvansa (Committer).
-------------
PR Review: https://git.openjdk.org/crac/pull/290#pullrequestreview-3750582385
More information about the crac-dev
mailing list