[crac] RFR: Merge jdk:jdk-25+2

[duke]

On Fri, 7 Mar 2025 09:20:30 GMT, Dmitry Cherepanov <dcherepanov at openjdk.org> wrote:

> Merge jdk:jdk-25+2
> 
> <details>
> 
> <summary>Conflicts</summary>
> 
> 
> commit 176af1d8d5730a18500078a2e93fa1a93efa88c3 (HEAD -> merge-jdk, dmitry-crac/merge-jdk)
> Merge: 06c79cd035c ceb4366ebf0
> Author: Dmitry Cherepanov <dcherepanov at azul.com>
> Date:   Thu Mar 6 23:02:02 2025 +0400
> 
>     Merge jdk:jdk-25+2
> 
> diff --git a/src/hotspot/os/linux/os_linux.hpp b/src/hotspot/os/linux/os_linux.hpp
> remerge CONFLICT (content): Merge conflict in src/hotspot/os/linux/os_linux.hpp
> index 038d8d93e26..a88bdaef30a 100644
> --- a/src/hotspot/os/linux/os_linux.hpp
> +++ b/src/hotspot/os/linux/os_linux.hpp
> @@ -1,12 +1,6 @@
>  /*
> -<<<<<<< 06c79cd035c (8350845: [CRaC] Support C/R engines in form of a library)
> - * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
> - * Copyright (c) 2017, 2021, Azul Systems, Inc. All rights reserved.
> -||||||| bedb68aba12
> - * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
> -=======
>   * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
> ->>>>>>> ceb4366ebf0 (8345955: Deprecate the UseOprofile flag with a view to removing the legacy oprofile support in the VM)
> + * Copyright (c) 2017, 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
> 
> 
> </details>

@dimitryc 
Your change (at version 176af1d8d5730a18500078a2e93fa1a93efa88c3) is now ready to be sponsored by a Committer.

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

PR Comment: https://git.openjdk.org/crac/pull/208#issuecomment-2750728789