Merge master jdk-21.0.2+13 into openj9-staging #121
Merged
Conversation
This file contains 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
Reviewed-by: wetmore Backport-of: 7f5e120a631ffda3e6d5efc03bae572b21877b69
Reviewed-by: robm
…forking Oct CPU23_10 Reviewed-by: coffeys
…with jtreg test timeout Reviewed-by: ssahoo Backport-of: 8042a50b99a671390910afa5f816894f77255429
Backport-of: d25ee81f56d67f2c51ba8b8c59f470c6f88ae47f
Reviewed-by: mdoerr, coffeys
Backport-of: 9c6eb67e85e35b3b40c258891789bd3e757a0c17
8311591: Add SystemModulesPlugin test case that splits module descriptors with new local variables defined by DedupSetBuilder Reviewed-by: phh Backport-of: ea5aa61c8cc5caa04f7c7eac9634df28011581dc
Reviewed-by: phh Backport-of: c50315de8f13d316a7de08be53716cd88fa801c4
Reviewed-by: asotona, vromero Backport-of: 84425a62904f84601affc9710eefece88665374a
Backport-of: f3ade388dac0b882e671462caa762138f44817fb
Backport-of: b74805d38395ca8be9308d882bf6b84e93714849
Backport-of: 4f90abaf17716493bad740dcef76d49f16d69379
Backport-of: 1e7e2bcf3560e1ad39516fb604e4d8bf85bb54e0
Backport-of: 44576a7cca18108adafa7efe88de2a4655e9b074
Backport-of: c4b8574b94c1987d45fae8d9d39acf4883363591
…a, Permission denied for writing /var/tmp/*.files Reviewed-by: asemenyuk Backport-of: fac9f88c52a07d972bad48d9ec116cb7e0fc5052
…iew) Backport-of: ec1f7a8480db025a6f405817a106af8e92b69c44
Backport-of: 726c9c977dbaab75a2df4a931e3414ccabb7db44
…run as user with Administrator privileges Backport-of: 69c9ec92d04a399946b2157690a1dc3fec517329
…gal/jline.md Backport-of: 87a6acbeee1673526bfc5f8692e0949cb113e841
…ils on AIX due to small default RCVBUF size and different IPv6 Header interpretation Backport-of: 486fa08d4b22243443d39efa34c78d7e9eb44775
Backport-of: 3f19df685c342cef212305cca630331878a24e79
Backport-of: 0f77d250b67ae0678756f986607eb239641dfb9e
…ization.java on linux-all Backport-of: f6e5559ae9d1c8b84b31af5d36e93b43e7731ba5
…pe of a constructor Backport-of: 5e24aaf4f7f11862ec8ac9d5c3e65d614104fb2c
…pe of a constructor Reviewed-by: vromero Backport-of: 5e24aaf4f7f11862ec8ac9d5c3e65d614104fb2c
Reviewed-by: shade
Backport-of: c521825a5d986e5cb823615d60e51f954c0ff4dc
…t encode params correctly Backport-of: 11e4a925bec3c1f79e03045d48def53188b655e6
… plugins across compilation boundaries Reviewed-by: coffeys, robm
… plugins across compilation boundaries Backport-of: ccf550a
…en AVX instructions are used Backport-of: ed9f3243f04718a50bbdc589437872f7215c0e08
Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
Add OpenSSL 3.x license to openj9-openjdk-notices
pshipton
requested changes
Jan 17, 2024
Conflicts: src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template src/java.base/share/classes/jdk/internal/foreign/CABI.java src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java src/java.desktop/share/native/libharfbuzz/hb-map.hh test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/VThreadEventTest.java test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp test/jdk/java/foreign/TestClassLoaderFindNative.java test/jdk/java/foreign/callarranger/platform/PlatformLayouts.java Modified: src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java src/java.base/share/classes/jdk/internal/foreign/abi/s390/linux/LinuxS390CallArranger.java Removed: src/java.base/share/classes/jdk/internal/foreign/abi/s390x Signed-off-by: Jason Feng fengj@ca.ibm.com
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
JasonFengJ9
force-pushed
the
mergestaging
branch
from
6e04aeb
to
3091796
Compare
JasonFengJ9
changed the title
|
Updated with |
pshipton
approved these changes
Jan 17, 2024
keithc-ca
approved these changes
Jan 17, 2024
|
I'll create separate pull request(s) to remove the unnecessary code in |
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-21.0.2+13 into openj9-staging
Conflicts:
Modified:
Removed:
Signed-off-by: Jason Feng fengj@ca.ibm.com