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

8276025: Hotspot's libsvml.so may conflict with user dependency #250

Closed
wants to merge 1 commit into from

Conversation

sviswa7
Copy link
Contributor

@sviswa7 sviswa7 commented Nov 10, 2021

Clean backport to fix the conflicts with libsvml.so distributed with Intel's MKL library.

Best Regards,
Sandhya


Progress

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

Issue

  • JDK-8276025: Hotspot's libsvml.so may conflict with user dependency

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17u pull/250/head:pull/250
$ git checkout pull/250

Update a local copy of the PR:
$ git checkout pull/250
$ git pull https://git.openjdk.java.net/jdk17u pull/250/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 250

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u/pull/250.diff

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 10, 2021

👋 Welcome back sviswanathan! 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 9ad4d3d06bb356436d69af07726ef6727c500f59 8276025: Hotspot's libsvml.so may conflict with user dependency Nov 10, 2021
@openjdk
Copy link

openjdk bot commented Nov 10, 2021

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

@openjdk openjdk bot added the backport label Nov 10, 2021
@sviswa7 sviswa7 marked this pull request as ready for review November 10, 2021 21:49
@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 10, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 10, 2021

Webrevs

@sviswa7
Copy link
Contributor Author

sviswa7 commented Nov 10, 2021

@vnkozlov Could you please review and approve. This is a clean backport but somehow the bot hasn't applied the clean label.

@vnkozlov
Copy link
Contributor

@sviswa7 You need to integrate it first as you did for 8273450.
I also need to test it together with closed changes as I did for JDK 18. After everything is good I will sponsor it together with closed part.

@sviswa7
Copy link
Contributor Author

sviswa7 commented Nov 10, 2021

@vnkozlov Thanks, I followed the same steps as for 8273450. (https://wiki.openjdk.java.net/display/JDKUpdates/How+to+contribute+a+fix)

@vnkozlov
Copy link
Contributor

Hmm. In 8273450 I see Bot's comment:
@openjdk openjdk bot added backport clean labels 23 hours ago

But for some reasons current changes are not treated as clean by Bot:
@openjdk openjdk bot added the backport label 2 hours ago

It asked for review. Okay I will add approval.

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Clean backport.

@openjdk
Copy link

openjdk bot commented Nov 10, 2021

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

8276025: Hotspot's libsvml.so may conflict with user dependency

Reviewed-by: kvn

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. Possible candidates are the reviewers of this PR (@vnkozlov) 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 added the ready Pull request is ready to be integrated label Nov 10, 2021
@sviswa7
Copy link
Contributor Author

sviswa7 commented Nov 11, 2021

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Nov 11, 2021
@openjdk
Copy link

openjdk bot commented Nov 11, 2021

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

@vnkozlov
Copy link
Contributor

Testing passed.

@sviswa7
Copy link
Contributor Author

sviswa7 commented Nov 11, 2021

Thanks a lot @vnkozlov.

@vnkozlov
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Nov 11, 2021

Going to push as commit 3e349b4.

@openjdk openjdk bot closed this Nov 11, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and 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 Nov 11, 2021
@openjdk
Copy link

openjdk bot commented Nov 11, 2021

@vnkozlov @sviswa7 Pushed as commit 3e349b4.

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

@vnkozlov
Copy link
Contributor

I pushed closed part too.

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.

None yet

2 participants