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

Merge jdk #535

Closed
wants to merge 152 commits into from
Closed

Merge jdk #535

wants to merge 152 commits into from

Conversation

MrSimms
Copy link
Member

@MrSimms MrSimms commented Aug 19, 2021

Merge tag 'jdk-18+11'

Conflicts:

src/hotspot/share/classfile/javaClasses.inline.hpp

src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp

src/hotspot/share/opto/macroArrayCopy.cpp

src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java


Progress

  • Change must not contain extraneous whitespace

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 535

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

Using diff file

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

fisk and others added 30 commits Aug 4, 2021
Reviewed-by: iwalulya, tschatzl, lkorinth
Reviewed-by: psandoz, bpb
… as ignoring external VM flags

Reviewed-by: coleenp
… Full GC uses >1 workers

Reviewed-by: ayang, tschatzl
Reviewed-by: jwilhelm, ctornqvi
….MAX_VALUE bytes in one call

Reviewed-by: alanb, vtewari
rhalade and others added 15 commits Aug 17, 2021
…ava.nio.file.NoSuchFileException: /run/user/0"

Reviewed-by: alanb
…alse) is invoked

Reviewed-by: serb, psadhukhan
…roup path contains colon

Reviewed-by: mseledtsov, sgehwolf
Added tag jdk-18+11 for changeset 96107e3

# Conflicts:
#	src/hotspot/share/classfile/javaClasses.inline.hpp
#	src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
#	src/hotspot/share/opto/macroArrayCopy.cpp
#	src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
@bridgekeeper
Copy link

bridgekeeper bot commented Aug 19, 2021

👋 Welcome back dsimms! A progress list of the required criteria for merging this PR into lworld will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@MrSimms
Copy link
Member Author

MrSimms commented Aug 19, 2021

/summary Merge tag 'jdk-18+11'

@openjdk
Copy link

openjdk bot commented Aug 19, 2021

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

Merge jdk

Merge tag 'jdk-18+11'

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 lworld 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.

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

@openjdk
Copy link

openjdk bot commented Aug 19, 2021

@MrSimms Setting summary to Merge tag 'jdk-18+11'

@mlbridge
Copy link

mlbridge bot commented Aug 19, 2021

Webrevs

@MrSimms
Copy link
Member Author

MrSimms commented Aug 19, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Aug 19, 2021

Going to push as commit 55f8d9e.

@openjdk openjdk bot closed this Aug 19, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Aug 19, 2021
@openjdk
Copy link

openjdk bot commented Aug 19, 2021

@MrSimms Pushed as commit 55f8d9e.

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

@MrSimms MrSimms deleted the lworld_merge_jdk_18_11 branch Oct 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment