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 openjdk/jdk21u-dev:master #52

Closed

Conversation

earthling-amzn
Copy link
Contributor

@earthling-amzn earthling-amzn commented May 30, 2024

Merges tag jdk-21.0.4+5


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (1 review required, with at least 1 Committer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/shenandoah-jdk21u.git pull/52/head:pull/52
$ git checkout pull/52

Update a local copy of the PR:
$ git checkout pull/52
$ git pull https://git.openjdk.org/shenandoah-jdk21u.git pull/52/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 52

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/shenandoah-jdk21u/pull/52.diff

Webrev

Link to Webrev Comment

Sorry, something went wrong.

SendaoYan and others added 17 commits May 21, 2024 20:19
…on generic-all

Backport-of: 440782e0160f867f08afbec0abf48d557a522c72
Backport-of: 95f79c678737fb8de9ed45c516761d4d818869ef
Backport-of: b4ddddeff1ce4293c88a9ab8ad3ca9d3b0e2352e
…C threads

Backport-of: c1cfb43d8de8d0eed01b9bb6aa1202dc7cbff007
Reviewed-by: mbaesken
Backport-of: 1d1cd32bc355a33448d8f15555e142570bb49c21
…hod flushes to separate sections

Backport-of: 397d94831033e91c7a849774bf4e80d8f1c8ec66
Backport-of: 45ed97f15b96071e5d6b6d21e8f0129eda5aa447
Backport-of: aca1e8365bf0f64bf18caf798bbca1d25b3c4117
Backport-of: c9442014e561f8e1cb43a0e9f18a9a5ae2a7a2da
…native libraries

Backport-of: 32946e1882e9b22c983cbba3c6bda3cc7295946a
… -XX:TieredStopAtLevel=3

Backport-of: 5045839cb2095105a5c6c9eebc633a78b1e3213e
Backport-of: 377f2e538ae0fc94fc5483700a3ae70175017741
Reviewed-by: stuefe
Backport-of: 42b1d858d15fd06de9ce41b08b430b12724652e9
Backport-of: 6212264cc6fe428e8d15b7f33e2979c081e432d7
@bridgekeeper
Copy link

bridgekeeper bot commented May 30, 2024

👋 Welcome back wkemper! A progress list of the required criteria for merging this PR into master 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 May 30, 2024

@earthling-amzn 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

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 master 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 master branch, type /integrate in a new comment.

@openjdk
Copy link

openjdk bot commented May 30, 2024

@earthling-amzn this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout merge-jdk-21.0.4+5
git fetch https://git.openjdk.org/shenandoah-jdk21u.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch rfr Pull request is ready for review labels May 30, 2024
@openjdk openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Jun 17, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 17, 2024

Webrevs

@earthling-amzn
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 18, 2024

Going to push as commit 4c60325.
Since your change was applied there have been 4 commits pushed to the master branch:

  • 0697324: 8333930: GenShen: Check for cancellation of old mark after final mark
  • ba6aa29: 8333825: GenShen: Revert/Remove ShenandoahMaxEvacLABRatio
  • 0fde759: 8333109: GenShen: Factor generational mode out of gc helpers (redo)
  • 5178309: 8332913: GenShen: Restore shared update refs iterator

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 18, 2024
@openjdk openjdk bot closed this Jun 18, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 18, 2024
@openjdk
Copy link

openjdk bot commented Jun 18, 2024

@earthling-amzn Pushed as commit 4c60325.

💡 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
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

None yet

4 participants