[crac] RFR: Merge jdk:jdk-25+2
Dmitry Cherepanov
dcherepanov at openjdk.org
Fri Mar 7 09:26:50 UTC 2025
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>
-------------
Commit messages:
- Merge jdk:jdk-25+2
- 8345955: Deprecate the UseOprofile flag with a view to removing the legacy oprofile support in the VM
- 8345876: Update nativeAddAtIndex comment to match the code
- 8310691: [REDO] [vectorapi] Refactor VectorShuffle implementation
- 8345423: Shenandoah: Parallelize concurrent cleanup
- 8346039: [BACKOUT] - [C1] LIR Operations with one input should be implemented as LIR_Op1
- 8345959: Make JVM_IsStaticallyLinked JVM_LEAF
- 8345797: Update copyright year to 2024 for client-libs in files where it was missed
- 8345799: Update copyright year to 2024 for core-libs in files where it was missed
- 8345683: Remove special flags for files compiled for static libraries
- ... and 80 more: https://git.openjdk.org/crac/compare/06c79cd0...176af1d8
The webrevs contain the adjustments done while merging with regards to each parent branch:
- crac: https://webrevs.openjdk.org/?repo=crac&pr=208&range=00.0
- jdk:jdk-25+2: https://webrevs.openjdk.org/?repo=crac&pr=208&range=00.1
Changes: https://git.openjdk.org/crac/pull/208/files
Stats: 14268 lines in 2539 files changed: 7630 ins; 2324 del; 4314 mod
Patch: https://git.openjdk.org/crac/pull/208.diff
Fetch: git fetch https://git.openjdk.org/crac.git pull/208/head:pull/208
PR: https://git.openjdk.org/crac/pull/208
More information about the crac-dev
mailing list