[lworld] RFR: Merge jdk

David Simms dsimms at openjdk.java.net
Thu Feb 25 06:49:15 UTC 2021


Merge tag 'jdk-17+11'

# Conflicts:
#	src/hotspot/share/runtime/vmOperations.hpp
#	src/java.base/share/classes/java/lang/Object.java

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

Commit messages:
 - Merge tag 'jdk-17+11' into lworld_merge_jdk_17_11
 - 8254001: [Metrics] Enhance parsing of cgroup interface files for version detection
 - 8262315: missing ';' in generated entities
 - 8258855: Two tests sun/security/krb5/auto/ReplayCacheTestProc.java and ReplayCacheTestProcWithMD5.java failed on OL8.3
 - 8261919: java/util/Locale/LocaleProvidersRun.java failed with "RuntimeException: Expected log was not emitted. LogRecord: null"
 - 8261920: [AIX] jshell command throws java.io.IOError on non English locales
 - 8262259: Remove unused variable in MethodLiveness::BasicBlock::compute_gen_kill_single
 - 8262027: Improve how HttpConnection detects a closed channel when taking/returning a connection to the pool
 - 8256438: AArch64: Implement match rules with ROR shift register value
 - 8262269: javadoc test TestGeneratedClasses.java fails on Windows
 - ... and 99 more: https://git.openjdk.java.net/valhalla/compare/b5bf7a90...f96697b7

The webrevs contain the adjustments done while merging with regards to each parent branch:
 - lworld: https://webrevs.openjdk.java.net/?repo=valhalla&pr=350&range=00.0
 - jdk: https://webrevs.openjdk.java.net/?repo=valhalla&pr=350&range=00.1

Changes: https://git.openjdk.java.net/valhalla/pull/350/files
  Stats: 15675 lines in 391 files changed: 10831 ins; 2560 del; 2284 mod
  Patch: https://git.openjdk.java.net/valhalla/pull/350.diff
  Fetch: git fetch https://git.openjdk.java.net/valhalla pull/350/head:pull/350

PR: https://git.openjdk.java.net/valhalla/pull/350


More information about the valhalla-dev mailing list