Merge

Author: Zhengyu Gu

substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_jdk_internal_platform_CgroupMetrics_JDK17OrLater.java

@@ -22,7 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+<<<<<<< HEAD:substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_jdk_internal_platform_CgroupMetrics_JDK17OrLater.java
 package com.oracle.svm.core.jdk17;
+=======
+package com.oracle.svm.core.jdk11.jfr;
+>>>>>>> f178200c59a (Refactor and add framework for native jfr event support):substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_dcmd_DCmdStart.java
 
 import static com.oracle.svm.core.Containers.Options.UseContainerSupport;
 

tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/search.js

@@ -22,6 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+<<<<<<< HEAD:tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/search.js
+=======
+package com.oracle.svm.core.jdk11.jfr;
+>>>>>>> f178200c59a (Refactor and add framework for native jfr event support):substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_dcmd_DCmdStart.java
 
 var searchbtn, matchedtxt;
 // ctrl-F for search