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

8310233: Fix THP detection on Linux #1694

Closed
wants to merge 1 commit into from

Conversation

tstuefe
Copy link
Member

@tstuefe tstuefe commented Aug 25, 2023

Note: not for October CPU

Unclean backport. Needed as a prerequisite to fix JDK-8312182.

No factual differences exist; merge failed due to surrounding hunks being different (NULL->nullptr).


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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1694

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 25, 2023

👋 Welcome back stuefe! 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 openjdk bot changed the title Backport 37ca9024ef59d99cae0bd7e25b2e6d3c1e085f97 8310233: Fix THP detection on Linux Aug 25, 2023
@openjdk
Copy link

openjdk bot commented Aug 25, 2023

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

@openjdk openjdk bot added the backport label Aug 25, 2023
@tstuefe tstuefe marked this pull request as ready for review August 25, 2023 12:00
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 25, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 25, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Aug 25, 2023

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

8310233: Fix THP detection on Linux

Reviewed-by: phh

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 16 new commits pushed to 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.

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

@tstuefe
Copy link
Member Author

tstuefe commented Aug 30, 2023

Got commit approval, tests are green.

/integrate

@openjdk
Copy link

openjdk bot commented Aug 30, 2023

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 30, 2023

@tstuefe Pushed as commit 3681719.

💡 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
2 participants