Skip to content

Conversation

@adamfarley
Copy link

@adamfarley adamfarley commented Jun 9, 2023

Hi all,

This pull request contains a backport of commit 310aa934 from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 20 Apr 2023 and was reviewed by Martin Doerr, Tyler Steele and Phil Race.

Thanks!


Progress

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

Issue

  • JDK-8304291: [AIX] Broken build after JDK-8301998 (Bug - P3)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 74

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 9, 2023

👋 Welcome back afarley! 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 310aa9347861922af5f0311e9e93a5f49dee6adc 8304291: [AIX] Broken build after JDK-8301998 Jun 9, 2023
@openjdk
Copy link

openjdk bot commented Jun 9, 2023

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Jun 9, 2023
@openjdk
Copy link

openjdk bot commented Jun 9, 2023

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

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

8304291: [AIX] Broken build after JDK-8301998

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ 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 added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 9, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 9, 2023

Webrevs

@adamfarley
Copy link
Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 9, 2023
@openjdk
Copy link

openjdk bot commented Jun 9, 2023

@adamfarley
Your change (at version ba0389b) is now ready to be sponsored by a Committer.

@martinuy
Copy link
Contributor

martinuy commented Jun 10, 2023

Hi Adam,

I suggest to close this PR as changes must be against the "jdk<n>u-dev" repository. Also, I'm not sure of your intended action here but, as a reminder, integration for an updates project can only happen after the label jdk<n>u-fix-yes is added by a release Maintainer to the JBS ticket —even a Reviewer's approval is not enough.

Martin.-

@RealCLanger
Copy link
Contributor

I suggest to close this PR as changes must be against the "jdku-dev" repository.

Nope, that's not quite true. As this change should go in for 11.0.20 rampdown, here is the correct place. Please see also Goetz' JBS comment.

Also, I'm not sure of your intended action here but, as a reminder, integration for an updates project can only happen after the label jdku-fix-yes is added by a release Maintainer to the JBS ticket —even a Reviewer's approval is not enough.

Exactly. Please note this for future backports, @adamfarley. 😉

I'm sponsoring this now (after I approved it in JBS).

Cheers Christoph

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 12, 2023

Going to push as commit 1660788.

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

openjdk bot commented Jun 12, 2023

@RealCLanger @adamfarley Pushed as commit 1660788.

💡 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 Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants