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

8330011: [s390x] update block-comments to make code consistent #539

Closed

Conversation

offamitkumar
Copy link
Member

@offamitkumar offamitkumar commented Apr 27, 2024

Hi all,

This pull request contains a backport of commit 01bda278 from the openjdk/jdk repository.

The commit being backported was authored by Amit Kumar on 17 Apr 2024 and was reviewed by Lutz Schmidt.

Thanks!


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8330011 needs maintainer approval

Issue

  • JDK-8330011: [s390x] update block-comments to make code consistent (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 539

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 27, 2024

👋 Welcome back amitkumar! 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 Apr 27, 2024

@offamitkumar 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:

8330011: [s390x] update block-comments to make code consistent

Reviewed-by: lucy

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 3 new commits pushed to the master branch:

  • 3bb8eee: 8317809: Insertion of free code blobs into code cache can be very slow during class unloading
  • a4d8d06: 8328744: Parallel: Parallel GC throws OOM before heap is fully expanded
  • 87d5da4: 8328822: C2: "negative trip count?" assert failure in profile predicate code

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@RealLucy) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot changed the title Backport 01bda278d6a498ca89c0bc5218680cd51a04e9d3 8330011: [s390x] update block-comments to make code consistent Apr 27, 2024
@openjdk
Copy link

openjdk bot commented Apr 27, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Apr 27, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 27, 2024

Webrevs

@offamitkumar
Copy link
Member Author

@RealLucy would you take a quick look here as well. In this I had to modify the comments manually there were some other conflicts as well other than copyright header.

But still it only updates the comments , and minor c++ code alignment fix.

Copy link

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@openjdk
Copy link

openjdk bot commented Apr 30, 2024

⚠️ @offamitkumar This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@RealLucy
Copy link

RealLucy commented Apr 30, 2024 via email

@offamitkumar
Copy link
Member Author

/approval request Had to backport this change as Panama was ported in JDK-21 so comment needs to updated in JDK-21 repo as well.

@openjdk
Copy link

openjdk bot commented Apr 30, 2024

@offamitkumar
8330011: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Apr 30, 2024
@GoeLin
Copy link
Member

GoeLin commented May 2, 2024

Hi Amit, here also tests are missing. Also, please elaborate on the Risk in your fix-request comments.

@openjdk
Copy link

openjdk bot commented May 2, 2024

@offamitkumar Usage: /backport [disable] <repository> [<branch>] or /backport [disable] [<repository>]:<branch>

@offamitkumar
Copy link
Member Author

/approval request Had to backport this change as Panama was ported in JDK-21 so comment needs to updated in JDK-21 repo as well. As only comments are being updated. So risk here is low.

@openjdk
Copy link

openjdk bot commented May 2, 2024

@offamitkumar
8330011: The approval request has been updated successfully.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels May 3, 2024
@offamitkumar
Copy link
Member Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label May 4, 2024
@openjdk
Copy link

openjdk bot commented May 4, 2024

@offamitkumar
Your change (at version 596a9d0) is now ready to be sponsored by a Committer.

@shipilev
Copy link
Member

shipilev commented May 6, 2024

/sponsor

@openjdk
Copy link

openjdk bot commented May 6, 2024

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

  • abbad92: 8326201: [S390] Need to bailout cleanly if creation of stubs fails when code cache is out of space
  • 3770c28: 8331331: :tier1 target explanation in doc/testing.md is incorrect
  • 021372c: 8328703: Illegal accesses in Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ioctl0
  • d459ae9: 8329850: [AIX] Allow loading of different members of same shared library archive
  • 835d016: 8330094: RISC-V: Save and restore FRM in the call stub
  • 3bb8eee: 8317809: Insertion of free code blobs into code cache can be very slow during class unloading
  • a4d8d06: 8328744: Parallel: Parallel GC throws OOM before heap is fully expanded
  • 87d5da4: 8328822: C2: "negative trip count?" assert failure in profile predicate code

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 6, 2024

@shipilev @offamitkumar Pushed as commit 3ff5359.

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

Successfully merging this pull request may close these issues.

4 participants