[foreign-memaccess] RFR: Merge master [v2]

J.Duke duke at openjdk.java.net
Fri Oct 30 12:24:12 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

J. Duke has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 101 commits:

 - Merge branch 'foreign-memaccess' into openjdk-bot-68
 - Automatic merge of jdk:master into master
 - 8255565: [Vector API] Add missing format strings for extract instructs in x86.ad
   
   Reviewed-by: vlivanov, jbhateja
 - 8254972: Fix pretouch chunk calculations
   
   Reviewed-by: sjohanss, kbarrett
 - 8253473: Javadoc clean up in HttpHandler, HttpPrincipal, HttpContext, and HttpsConfigurator
   
   Reviewed-by: dfuchs
 - 8255595: delay_to_keep_mmu passes wrong arguments to Monitor wait
   
   Remove improper wait argument.
   
   Reviewed-by: sjohanss, tschatzl, ayang
 - 8255285: Move JVMFlag origins into a new enum JVMFlagOrigin
   
   Reviewed-by: dholmes, redestad
 - 8255466: C2 crashes at ciObject::get_oop() const+0x0
   
   Reviewed-by: vlivanov
 - 8254975: lambda proxy fails to access a protected member inherited from a split package
   
   Reviewed-by: rriggs
 - 8255604: java/nio/channels/DatagramChannel/Connect.java fails with java.net.BindException: Cannot assign requested address: connect
   
   Reviewed-by: dfuchs, michaelm
 - ... and 91 more: https://git.openjdk.java.net/panama-foreign/compare/9255b30d...38076bdb

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

Changes: https://git.openjdk.java.net/panama-foreign/pull/387/files
 Webrev: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=387&range=01
  Stats: 14747 lines in 479 files changed: 8670 ins; 4317 del; 1760 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