Skip to content

Merge master jdk-11.0.21+5 into openj9-staging - #695

Merged
keithc-ca merged 13 commits into
ibmruntimes:openj9-stagingfrom
JasonFengJ9:mergetmp
Aug 31, 2023
Merged

Merge master jdk-11.0.21+5 into openj9-staging#695
keithc-ca merged 13 commits into
ibmruntimes:openj9-stagingfrom
JasonFengJ9:mergetmp

Conversation

@JasonFengJ9

Copy link
Copy Markdown
Member

Merge master jdk-11.0.21+5 into openj9-staging

Conflicts:

	src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c

Signed-off-by: Jason Feng fengj@ca.ibm.com

Ben Taylor and others added 13 commits August 22, 2023 15:02
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>
@JasonFengJ9
JasonFengJ9 requested a review from keithc-ca August 31, 2023 12:25
@keithc-ca
keithc-ca merged commit f0db243 into ibmruntimes:openj9-staging Aug 31, 2023
@JasonFengJ9
JasonFengJ9 deleted the mergetmp branch August 31, 2023 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants