Merge jdk:master #131
Merge jdk:master #131
Conversation
…T|SA_SIGINFO found:SA_RESTART|SA_SIGINFO Reviewed-by: stuefe, coleenp, dcubed
Reviewed-by: coleenp, iklam
…er.java fails Reviewed-by: cjplummer, sspitsyn
Reviewed-by: shade, erikj, ihse
Reviewed-by: shade, erikj
Reviewed-by: shade
…to access variable sized PtrQueue::_index Reviewed-by: shade
…useless_nodes missed this node") Check for nodes missed by remove_useless_nodes() only if PhaseRemoveUseless has actually been run. This makes it possible to use -XX:-UseLoopSafepoints without crashing trivially, although implicit assumptions in other parts of C2 about the existence of loop safepoints might lead to more subtle failures for more complex methods. Reviewed-by: neliasso, thartmann, kvn
Reviewed-by: pliden
Reviewed-by: ayang, eosterlund
Reviewed-by: rkennke
Reviewed-by: jiefu, thartmann
Reviewed-by: rkennke
Reviewed-by: iklam, vlivanov
Reviewed-by: kvn, shade, thartmann
Reviewed-by: redestad
Reviewed-by: herrick, almatvee
…cimalFormat Reviewed-by: bpb
…java on linux-aarch64 Reviewed-by: mikael
…ing a header file Reviewed-by: ihse
8231547: Serializable class doc should link to serialization specification Reviewed-by: rriggs, iris, chegar
…rrent code root evacuator Reviewed-by: rkennke
…e initializing cgroupv1 subsystem Reviewed-by: shade, sgehwolf, bobv
Reviewed-by: shade
Reviewed-by: dfuchs, lancea, bpb
…() on x86 Reviewed-by: kvn
Reviewed-by: redestad, kvn
…MM0-15 registers Reviewed-by: kvn
Reviewed-by: thartmann, kvn
Reviewed-by: thartmann, kvn
Reviewed-by: rkennke
Reviewed-by: cjplummer, sspitsyn
|
|
openjdk
bot
added
merge-conflict
Webrevs
|
|
@openjdk-bot This change now passes all automated pre-integration checks. After integration, the commit message for the final commit will be: 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 As you do not have Committer status in this project an existing Committer must agree to sponsor your change.
|
openjdk
bot
added
ready
|
/integrate |
|
/integrate |
|
@kevinrushforth Only the author (@openjdk-bot) is allowed to issue the |
|
@openjdk-bot |
|
/sponsor |
openjdk
bot
added
integrated
|
@kevinrushforth @openjdk-bot Pushed as commit 155894a. |
Hi all,
this is an automatically generated pull request to notify you that there are 33 commits from the branch
jdk:masterthat can not be merged into the branchmaster:The following file contains merge conflicts:
All Committers in this project have access to my personal fork and can therefore help resolve these merge conflicts (you may want to coordinate who should do this).
The following paragraphs will give an example on how to solve these merge conflicts and push the resulting merge commit to this pull request.
The below commands should be run in a local clone of your personal fork of the openjdk/lanai repository.
When you have resolved the conflicts resulting from the
git mergecommand above, run the following commands to create a merge commit:$ git add paths/to/files/with/conflicts $ git commit -m 'Merge jdk:master'When you have created the merge commit, run the following command to push the merge commit to this pull request:
Note: if you are using SSH to push commits to GitHub, then change the URL in the above
git pushcommand accordingly.Thanks,
J. Duke
Progress
Testing
Failed test task
Download
$ git fetch https://git.openjdk.java.net/lanai pull/131/head:pull/131$ git checkout pull/131