Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge jdk #1084

Closed
wants to merge 295 commits into from
Closed

Merge jdk #1084

wants to merge 295 commits into from

Conversation

MrSimms
Copy link
Member

@MrSimms MrSimms commented Apr 26, 2024

Merge jdk-23+5


Progress

  • Change must not contain extraneous whitespace

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/valhalla.git pull/1084/head:pull/1084
$ git checkout pull/1084

Update a local copy of the PR:
$ git checkout pull/1084
$ git pull https://git.openjdk.org/valhalla.git pull/1084/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1084

View PR using the GUI difftool:
$ git pr show -t 1084

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/valhalla/pull/1084.diff

Webrev

Link to Webrev Comment

Roger Riggs and others added 30 commits December 12, 2023 20:55
…ences

Reviewed-by: sspitsyn, yyang, dholmes
Reviewed-by: iris, lancea, naoto
…s is not recognized

Reviewed-by: rcastanedalo, chagedorn, shade
Reviewed-by: dholmes, alanb
… CompactStrings is not enabled

Co-authored-by: Roger Riggs <rriggs@openjdk.org>
Reviewed-by: rriggs
Reviewed-by: alanb, kvn
…: cmpxchg_obj_header/cmpxchgptr

Reviewed-by: rehn, fyang
…ith /sys/kernel/mm/transparent_hugepage/hpage_pmd_size

Reviewed-by: mdoerr, lucy
William Kemper and others added 15 commits January 10, 2024 17:10
… GC should be mangled

Reviewed-by: ysr, kdnilsen, shade
Co-authored-by: Pavel Rappo <prappo@openjdk.org>
Reviewed-by: rriggs
…file attributes' bits

Reviewed-by: clanger, lancea
8322830: Add test case for ZipFile opening a ZIP with no entries

Reviewed-by: lancea
@MrSimms
Copy link
Member Author

MrSimms commented Apr 26, 2024

/summary Merge jdk-23+5

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 26, 2024

👋 Welcome back dsimms! A progress list of the required criteria for merging this PR into lworld will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Apr 26, 2024

@MrSimms This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

Merge jdk

Merge jdk-23+5

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the lworld branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the lworld branch, type /integrate in a new comment.

@mlbridge
Copy link

mlbridge bot commented Apr 26, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Apr 26, 2024

@MrSimms Setting summary to Merge jdk-23+5

@MrSimms
Copy link
Member Author

MrSimms commented Apr 29, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Apr 29, 2024

Going to push as commit f40784d.
Since your change was applied there has been 1 commit pushed to the lworld branch:

  • ff56a57: 8331220: [lworld] minor clean up (no runtime change)

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Apr 29, 2024
@openjdk openjdk bot closed this Apr 29, 2024
@openjdk
Copy link

openjdk bot commented Apr 29, 2024

@MrSimms Pushed as commit f40784d.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment