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/jdk:master #368

Closed
wants to merge 144 commits into from

Conversation

earthling-amzn
Copy link
Contributor

@earthling-amzn earthling-amzn commented Dec 12, 2023

Merges tag jdk-22+27


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.git pull/368/head:pull/368
$ git checkout pull/368

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 368

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

Using diff file

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

Webrev

Link to Webrev Comment

Sorry, something went wrong.

Alex Menkov and others added 30 commits November 29, 2023 20:10
…tors should not have a dead object

Reviewed-by: dholmes, ihse, sspitsyn, dcubed
…Main Method (Second Preview)

Reviewed-by: jlahoda, mcimadamore, vromero, rriggs, alanb, mchung
Reviewed-by: tvaleev, alanb, psandoz
…endingStackTrace.java failed with "OutOfMemoryError: GC overhead limit exceeded"

Reviewed-by: sjohanss, tschatzl
Reviewed-by: sviswanathan, jbhateja
…ent keyboard layouts

Reviewed-by: aivanov, kizune
Reviewed-by: mcimadamore, jvernee, dcubed
…ocol

Reviewed-by: lmesnik, pchilanomate, amenkov
8318653: UpcallTestHelper::runInNewProcess waits for forked process without timeout

Reviewed-by: shade, mcimadamore
Markus Grönlund and others added 14 commits December 7, 2023 10:45
Reviewed-by: egahlin, jbachorik
…onTest.java fails due to dynamic reconfigurations of network interface during test

Reviewed-by: jpai
Reviewed-by: mgronlun
Reviewed-by: mgronlun
8321002: RISC-V: C2 SignumVD

Reviewed-by: fyang
Reviewed-by: stuefe, gziemski, stefank
@bridgekeeper
Copy link

bridgekeeper bot commented Dec 12, 2023

👋 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 Dec 12, 2023

@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-22+27
git fetch https://git.openjdk.org/shenandoah.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 Dec 12, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 12, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Dec 13, 2023

@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 openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Dec 13, 2023
@earthling-amzn
Copy link
Contributor Author

/integrate

Single test failure in tier3, looks unrelated to Shenandoah.

@openjdk
Copy link

openjdk bot commented Dec 13, 2023

Going to push as commit ba3f619.

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

openjdk bot commented Dec 13, 2023

@earthling-amzn Pushed as commit ba3f619.

💡 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