Merge

Author: JesperIRL

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties

@@ -629,7 +629,8 @@ doclet.usage.override-methods.parameters=\
     (detail|summary)
 
 doclet.usage.override-methods.description=\
-    Document overridden methods in the detail or summary sections
+    Document overridden methods in the detail or summary sections.\n\
+    The default is 'detail'.
 
 doclet.usage.allow-script-in-comments.description=\
     Allow JavaScript in options and comments

test/hotspot/jtreg/ProblemList.txt

@@ -120,6 +120,8 @@ serviceability/sa/ClhsdbPstack.java#core 8269982,8267433 macosx-aarch64,macosx-x
 serviceability/sa/TestJmapCore.java 8269982,8267433 macosx-aarch64,macosx-x64
 serviceability/sa/TestJmapCoreMetaspace.java 8269982,8267433 macosx-aarch64,macosx-x64
 
+serviceability/jvmti/vthread/VThreadNotifyFramePopTest/VThreadNotifyFramePopTest.java 8288214 generic-all
+
 #############################################################################
 
 # :hotspot_misc