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

J.Duke duke at openjdk.java.net
Thu May 28 10:12:24 UTC 2020

> Hi all,
> this is an _automatically_ generated pull request to notify you that there are 56 commits from the branch
> `foreign-abi`that can **not** be merged into the branch `foreign-jextract`:
> The following files contains merge conflicts:
> - make/autoconf/libraries.m4
> - make/conf/jib-profiles.js
> 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 +39:openjdk-bot-39
> $ git checkout openjdk-bot-39
> # 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-39:39
> _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
57 commits:

 - Merge branch 'foreign-jextract' into 39
 - Automatic merge of foreign-memaccess into foreign-abi
 - Merge master
 - Merge remote-tracking branch 'remotes/jdk/master'
 - 8245179: JvmciNotifyBootstrapFinishedEventTest.java fails with custom Tiered Level set externally
   Fixed to not to run the testcase with TieredStopAtLevel set
   Reviewed-by: thartmann
 - 8245801: StressRecompilation triggers assert "redundunt OSR recompilation detected. memory leak in CodeCache!"
   Assert is too strong.
   Reviewed-by: roland
 - 8245756: Reduce bootstrap cost of StringConcatFactory prependers
   Reviewed-by: forax, psandoz
 - 8245724: Move g1 periodic gc logging to G1InitLogger
   Reviewed-by: kbarrett, tschatzl
 - 8245723: Remove PrintCompressedOopsMode and change gc+heap+coops info log to debug level
   Reviewed-by: dholmes, coleenp, tschatzl
 - 8245812: Shenandoah: compute root phase parallelism
   Reviewed-by: zgu
 - ... and 47 more: https://git.openjdk.java.net/panama-foreign/compare/0e27dc97...c81881b1



Changes: https://git.openjdk.java.net/panama-foreign/pull/185/files
 Webrev: https://webrevs.openjdk.java.net/panama-foreign/185/webrev.01
  Stats: 66416 lines in 335 files changed: 4006 ins; 61307 del; 1103 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/185.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/185/head:pull/185

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

More information about the panama-dev mailing list