[foreign-jextract] Integrated: Merge foreign-memaccess+abi

J.Duke duke at openjdk.java.net
Mon Dec 14 14:02:09 UTC 2020


Hi all,

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

The following files contains merge conflicts:

- make/autoconf/spec.gmk.in
- src/hotspot/cpu/aarch64/aarch64Test.cpp
- src/hotspot/share/gc/shared/weakProcessorPhase.hpp
- test/jdk/tools/jextract/test8253102/libTest8253102.c

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-jextract
$ git pull https://github.com/openjdk/panama-foreign.git foreign-jextract

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

# 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-memaccess+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.git openjdk-bot-85:85

_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:
 - Merge branch 'foreign-jextract' into 85
 - Merge master
 - Automatic merge of jdk:master into master
 - 8257970: Remove julong types in os::limit_heap_by_allocatable_memory
 - 8257145: Performance regression with -XX:-ResizePLAB after JDK-8079555
 - 8257676: Simplify WeakProcessorPhase
 - 8196090: javax/swing/JComboBox/6559152/bug6559152.java fails
 - 8243205: Modularize JVM flags declaration
 - 8258073: x86_32 build broken after JDK-8257731
 - 8247402: Documentation for Map::compute contains confusing implementation requirements
 - ... and 260 more: https://git.openjdk.java.net/panama-foreign/compare/1af1f255...03cfb71b

The merge commit only contains trivial merges, so no merge-specific webrevs have been generated.

Changes: https://git.openjdk.java.net/panama-foreign/pull/415/files
  Stats: 1 line in 1 file changed: 1 ins; 0 del; 0 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/415.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/415/head:pull/415

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


More information about the panama-dev mailing list