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 foreign-abi #140

Closed
wants to merge 120 commits into from
Closed

Merge foreign-abi #140

wants to merge 120 commits into from

Conversation

@openjdk-bot
Copy link
Contributor

@openjdk-bot openjdk-bot commented May 1, 2020

Hi all,

this is an automatically generated pull request to notify you that there are 118 commits from the branch foreign-abithat can not be merged into the branch foreign-jextract:

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/panama-foreign repository.

# Ensure target branch is up to date
$ git checkout foreign-jextract
$ git pull https://github.com/openjdk/panama-foreign foreign-jextract

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/panama-foreign +31:openjdk-bot-31
$ git checkout openjdk-bot-31

# Merge the target branch
$ git merge foreign-jextract

When you have resolved the conflicts resulting from the git merge command above, run the following commands to create a merge commit:

$ git add paths/to/files/with/conflicts
$ git commit -m 'Merge foreign-abi'

When you have created the merge commit, run the following command to push the merge commit to this pull request:

$ git push https://github.com/openjdk-bot/panama-foreign openjdk-bot-31:31

Note: if you are using SSH to push commits to GitHub, then change the URL in the above git push command accordingly.

Thanks,
J. Duke


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Download

$ git fetch https://git.openjdk.java.net/panama-foreign pull/140/head:pull/140
$ git checkout pull/140

rwestrel and others added 30 commits Apr 15, 2020
…(obj)->isa_oopptr()) failed: only for oop input"

Reviewed-by: kvn, thartmann
…plify expand_at

Reviewed-by: tschatzl, sangheki
…unk header byte 32

The HTTP/1 chunked body parser is updated to discard chunk extensions

Reviewed-by: chegar, alanb
Reviewed-by: herrick, almatvee
Decrement the refcount for all Klass in class unloading.

Reviewed-by: lfoltan, hseigel
… failed with Unsupported signature algorithm: DSA

Reviewed-by: xuelei
…opts' and not 'test.vm.opts'

Reviewed-by: lmesnik, dholmes
Added comma.

Reviewed-by: iignatyev
Cleanup prefetching code and use AllocatePrefetchLines=1 by default.

Reviewed-by: goetz, mhorie, lucy
Reviewed-by: egahlin
Reviewed-by: mgronlun, mseledtsov
Reviewed-by: mbaesken
Co-authored-by: Eirik Bjørsnøs <eirbjo@gmail.com>
Reviewed-by: lancea, simonis
Reviewed-by: lancea, dfuchs, weijun
@openjdk openjdk bot added the failed-auto-merge label May 1, 2020
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 1, 2020

👋 Welcome back duke! A progress list of the required criteria for merging this PR into foreign-jextract will be added to the body of your pull request.

@openjdk
Copy link

@openjdk openjdk bot commented May 1, 2020

@openjdk-bot This change now passes all automated pre-integration checks, type /integrate in a new comment to proceed. After integration, the commit message will be:

Merge foreign-abi
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /solves command.

There are currently no new commits on the foreign-jextract branch since the last update of the source branch of this PR. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you would like to avoid potential automatic rebasing, specify the current head hash when integrating, like this: /integrate bdbdb93f8f062c779202986fb0f8a6de0e541b5e.

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 and removed merge-conflict labels May 1, 2020
@openjdk-bot
Copy link
Contributor Author

@openjdk-bot openjdk-bot commented May 1, 2020

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented May 1, 2020

@openjdk-bot
Your change (at version e3e198b) is now ready to be sponsored by a Committer.

@openjdk openjdk bot added the sponsor label May 1, 2020
@mcimadamore
Copy link
Collaborator

@mcimadamore mcimadamore commented May 1, 2020

/sponsor

@openjdk openjdk bot closed this May 1, 2020
@openjdk openjdk bot added integrated and removed sponsor ready rfr labels May 1, 2020
@openjdk
Copy link

@openjdk openjdk bot commented May 1, 2020

@mcimadamore @openjdk-bot
Pushed as commit 629afd9.

@mlbridge
Copy link

@mlbridge mlbridge bot commented May 1, 2020

Webrevs

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

You can’t perform that action at this time.