[foreign-jextract] RFR: Merge foreign-abi [v2]

J.Duke duke at openjdk.java.net
Fri Jul 31 14:18:54 UTC 2020


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 228 commits from the branch
> `foreign-abi`that can **not** be merged into the branch `foreign-jextract`:
> The following file contains merge conflicts:
> 
> - README
> 
> All Committers in this [project](https://openjdk.java.net/census#Optional[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-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 +48:openjdk-bot-48
> $ git checkout openjdk-bot-48
> 
> # 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-48:48
> 
> _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
229 commits:

 - Merge branch 'foreign-jextract' into openjdk-bot-48
 - Automatic merge of foreign-memaccess into foreign-abi
 - Automatic merge of master into foreign-memaccess
 - Automatic merge of jdk:master into master
 - 8241518: Member signature parameter span contains closing but not opening parens
   
   Reviewed-by: prappo
 - 6501010: test/java/io/File/GetXSpace.java fails on Windows
   
   Reviewed-by: bpb
 - 8250863: Build error with GCC 10 in NetworkInterface.c and k_standard.c
   
   Reviewed-by: aph, ysuenaga
 - 8249772: (ch) Improve sun/nio/ch/TestMaxCachedBufferSize.java
   
   Reviewed-by: alanb
 - 8250779: Anchor is ignored when reloading a page in Chrome
   
   Reviewed-by: prappo
 - 8249837: Avoid direct or implicit Thread::current() calls when we already have a current thread variable
   
   Add current thread OR remove unneeded HandleMark
   
   Reviewed-by: kvn, dholmes
 - ... and 219 more: https://git.openjdk.java.net/panama-foreign/compare/a515103b...ab806c15

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

Changes: https://git.openjdk.java.net/panama-foreign/pull/275/files
 Webrev: https://webrevs.openjdk.java.net/panama-foreign/275/webrev.01
  Stats: 8137 lines in 536 files changed: 5227 ins; 1407 del; 1503 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/275.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/275/head:pull/275

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


More information about the panama-dev mailing list