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

8297887: Update Siphash #2022

Closed
wants to merge 1 commit into from
Closed

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jul 4, 2023

I backport this for parity with 11.0.21-oracle.

I had to resolve the Copyright, will mark as clean.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2022

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 4, 2023

👋 Welcome back goetz! 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 bacf652311a74d93f6f802c51a1a2150522704cb 8297887: Update Siphash Jul 4, 2023
@openjdk
Copy link

openjdk bot commented Jul 4, 2023

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 Jul 4, 2023
@mlbridge
Copy link

mlbridge bot commented Jul 4, 2023

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Jul 5, 2023

/clean

@openjdk openjdk bot added the clean label Jul 5, 2023
@openjdk
Copy link

openjdk bot commented Jul 5, 2023

@GoeLin This backport pull request is now marked as clean

@openjdk
Copy link

openjdk bot commented Jul 5, 2023

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

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

8297887: Update Siphash

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:

  • 6b77069: 8291830: jvmti/RedefineClasses/StressRedefine failed: assert(!is_null(v)) failed: narrow klass value can never be zero
  • b3417d8: 8293657: sun/management/jmxremote/bootstrap/RmiBootstrapTest.java#id1 failed with "SSLHandshakeException: Remote host terminated the handshake"
  • a975a1e: 8286620: Create regression test for verifying setMargin() of JRadioButton

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.

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

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 5, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jul 5, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jul 5, 2023

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

  • 2854320: 8306638: Open source some AWT tests related to datatransfer and Toolkit
  • 9fecfb3: 8305950: Have -XshowSettings option display tzdata version
  • 6b84480: 8304054: Linux: NullPointerException from FontConfiguration.getVersion in case no fonts are installed
  • 532fbe9: 8291444: GHA builds/tests won't run manually if disabled from automatic running
  • 6b77069: 8291830: jvmti/RedefineClasses/StressRedefine failed: assert(!is_null(v)) failed: narrow klass value can never be zero
  • b3417d8: 8293657: sun/management/jmxremote/bootstrap/RmiBootstrapTest.java#id1 failed with "SSLHandshakeException: Remote host terminated the handshake"
  • a975a1e: 8286620: Create regression test for verifying setMargin() of JRadioButton

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 5, 2023

@GoeLin Pushed as commit 750387b.

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

@GoeLin GoeLin deleted the goetz_backport_8297887 branch July 5, 2023 11:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant