Merge master jdk-11.0.21+5 into openj9-staging - #695
Merged
Conversation
Reviewed-by: simonis, goetz
Reviewed-by: simonis Backport-of: 13f6450e2e70df4df8bd882def837fbd5bef1524
Backport-of: 6d6f726b74f7fcd3e7c37d50bd2476b3e921662b
Backport-of: 9beae21864d18054ca3762ec989d51ff0660db84
Backport-of: b8de39431dca90e63552968829a349a9b63e68ca
Reviewed-by: mdoerr Backport-of: 723582c524c62ee73f7984a53b046f8832b23a7f
Backport-of: d6a75a0f86d4c84132a3794c432b34068163fa60
…it orientation Backport-of: d00a767047ec41e233e711dbc5fe7b8818e72f28
Backport-of: ec2abc2d82bf737258ae8ee0bba8ba6a15e1dabb
…nput/output error" in java.lang.ProcessHandleImpl$Info.info0 Backport-of: d24b7b7026cf85f1aecf44f60819762872cfd5c1
Conflicts: src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
keithc-ca
approved these changes
Aug 31, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge master jdk-11.0.21+5 into openj9-staging
Conflicts:
Signed-off-by: Jason Feng fengj@ca.ibm.com