[foreign-memaccess] RFR: Merge master

J.Duke duke at openjdk.java.net
Fri Oct 30 11:08:05 UTC 2020


Hi all,

this is an _automatically_ generated pull request to notify you that there are 100 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess`:

The following file contains merge conflicts:

- test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/SegmentTestDataProvider.java

All Committers in this [project](https://openjdk.java.net/census#panama) have access to my [personal fork](https://github.com/openjdk-bot/panama-foreign) 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](https://wiki.openjdk.java.net/display/skara#Skara-Personalforks) of the [openjdk/panama-foreign](https://github.com/openjdk/panama-foreign) repository.

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

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

# Merge the target branch
$ git merge foreign-memaccess

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-68:68

_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

-------------

Commit messages:
 - Automatic merge of jdk:master into master
 - 8255565: [Vector API] Add missing format strings for extract instructs in x86.ad
 - 8254972: Fix pretouch chunk calculations
 - 8253473: Javadoc clean up in HttpHandler, HttpPrincipal, HttpContext, and HttpsConfigurator
 - 8255595: delay_to_keep_mmu passes wrong arguments to Monitor wait
 - 8255285: Move JVMFlag origins into a new enum JVMFlagOrigin
 - 8255466: C2 crashes at ciObject::get_oop() const+0x0
 - 8254975: lambda proxy fails to access a protected member inherited from a split package
 - 8255604: java/nio/channels/DatagramChannel/Connect.java fails with java.net.BindException: Cannot assign requested address: connect
 - 8255449: Improve the exception message of MethodHandles::permuteArguments
 - ... and 90 more: https://git.openjdk.java.net/panama-foreign/compare/22d61518...db04d759

The webrev contains the conflicts with foreign-memaccess:
 - merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=387&range=00.conflicts

Changes: https://git.openjdk.java.net/panama-foreign/pull/387/files
  Stats: 14753 lines in 480 files changed: 8670 ins; 4317 del; 1766 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/387.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/387/head:pull/387

PR: https://git.openjdk.java.net/panama-foreign/pull/387


More information about the panama-dev mailing list