[foreign-jextract] [Rev 01] RFR: Merge foreign-abi

J.Duke duke at openjdk.java.net
Fri May 1 13:45:23 UTC 2020

> Hi all,
> this is an _automatically_ generated pull request to notify you that there are 118 commits from the branch
> `foreign-abi`that can **not** be merged into the branch `foreign-jextract`:
> The following file contains merge conflicts:
> 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 +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

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

 - Move jextract-related build file to new module-dependent locations
 - Merge branch 'foreign-jextract' into openjdk-bot-31
 - Automatic merge of foreign-memaccess into foreign-abi
 - Automatic merge of master into foreign-memaccess
 - Automatic merge of jdk:master into master
 - 8243628: Deprecate -XX:ForceNUMA option
   Added ForceNUMA to the deprecation table for jdk15.
   Reviewed-by: pliden, tschatzl
 - 8244087: 2020-04-24 public suffix list update
   Reviewed-by: mullan
 - 8219536: Add Option for user defined jlink options
   Reviewed-by: asemenyuk, almatvee
 - 8244173: Uncomment subtest in runtime/InvocationTests/invocationC1Tests.java
   Reviewed-by: hseigel, iignatyev
 - 8225068: Remove DocuSign root certificate that is expiring in May 2020
   Reviewed-by: mullan
 - ... and 110 more: https://git.openjdk.java.net/panama-foreign/compare/bdbdb93f...e3e198bf


Changes: https://git.openjdk.java.net/panama-foreign/pull/140/files
 Webrev: https://webrevs.openjdk.java.net/panama-foreign/140/webrev.01
  Stats: 24887 lines in 1527 files changed: 14700 ins; 6844 del; 3343 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/140.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/140/head:pull/140

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

More information about the panama-dev mailing list