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 master #542

Closed
wants to merge 90 commits into from
Closed

Merge master #542

wants to merge 90 commits into from

Conversation

@openjdk-bot
Copy link
Contributor

@openjdk-bot openjdk-bot commented May 28, 2021

Hi all,

this is an automatically generated pull request to notify you that there are 90 commits from the branch masterthat can not be merged into the branch foreign-memaccess+abi:

The following files contains merge conflicts:

  • src/java.base/share/classes/java/lang/Module.java
  • src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java

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-memaccess+abi
$ git pull https://github.com/openjdk/panama-foreign.git foreign-memaccess+abi

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

# Merge the target branch
$ git merge foreign-memaccess+abi

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 master'

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.git openjdk-bot-96:96

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

/integrate auto


Progress

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

Error

 ⚠️ Merge commit message is not Merge .*, but: Merge

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/panama-foreign pull/542/head:pull/542
$ git checkout pull/542

Update a local copy of the PR:
$ git checkout pull/542
$ git pull https://git.openjdk.java.net/panama-foreign pull/542/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 542

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/panama-foreign/pull/542.diff

Nils Eliasson and others added 30 commits May 21, 2021
Reviewed-by: thartmann, redestad
Co-authored-by: Marcus G K Williams <mgkwill@openjdk.org>
Co-authored-by: Stefan Johansson <sjohanss@openjdk.org>
Co-authored-by: Thomas Stuefe <stuefe@openjdk.org>
Reviewed-by: stuefe, sjohanss
…nostic

8256301: ObjectMonitor::is_busy() should return bool

Reviewed-by: coleenp, pchilanomate
…a failed with OutOfMemoryError

Co-authored-by: xiangyuan <xiangyuan@tencent.com>
Reviewed-by: stuefe
…ample, unable to navigate to all items, with VO on

Reviewed-by: pbansal
…le adapters with the same address

Reviewed-by: dfuchs
…tSecurityManager

Co-authored-by: Lance Andersen <lancea@openjdk.org>
Co-authored-by: Weijun Wang <weijun@openjdk.org>
Reviewed-by: dholmes, alanb, dfuchs, mchung, mullan, prr
…ption: Address already in use" (macos-aarch64)

Reviewed-by: dfuchs, alanb
Reviewed-by: kcr, asemenyuk
…_relaxed()) failed: not empty

Reviewed-by: stefank, pliden
albertnetymk and others added 21 commits May 27, 2021
Co-authored-by: David Holmes <dholmes@openjdk.org>
Reviewed-by: iklam, kbarrett
…ch/javax/crypto/full/AESGCMBench:setup

Reviewed-by: redestad
…inside a container

Co-authored-by: Shaojun Wang <jeffery.wsj@alibaba-inc.com>
Co-authored-by: Severin Gehwolf <sgehwolf@openjdk.org>
Reviewed-by: sgehwolf, ysuenaga
Reviewed-by: dholmes, rehn, coleenp, eosterlund
Reviewed-by: erikj, rriggs, alanb
Reviewed-by: ysuenaga, simonis, stuefe, phh, dholmes, ayang
…Connector_NPETest.java

Reviewed-by: smarks
Reviewed-by: aivanov, azvegint, prr
Reviewed-by: dcubed, rrich, dholmes, pchilanomate
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 28, 2021

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

@openjdk
Copy link

@openjdk openjdk bot commented May 28, 2021

@openjdk-bot This pull request will be automatically integrated when it is ready

@mlbridge
Copy link

@mlbridge mlbridge bot commented May 28, 2021

@JornVernee
Copy link
Member

@JornVernee JornVernee commented Jun 2, 2021

Closing to redo merge with other changes as well

@JornVernee JornVernee closed this Jun 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment