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

J.Duke duke at openjdk.java.net
Fri Jul 23 12:02:32 UTC 2021


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 85 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
> 
> The following files contains merge conflicts:
> 
> - src/hotspot/cpu/x86/frame_x86.cpp
> - src/hotspot/share/prims/universalUpcallHandler.cpp
> - src/hotspot/share/prims/universalUpcallHandler.hpp
> - src/hotspot/share/runtime/javaFrameAnchor.hpp
> - src/hotspot/share/runtime/thread.cpp
> 
> 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+abi
> $ git pull https://github.com/openjdk/panama-foreign.git foreign-memaccess+abi
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign.git +103:openjdk-bot-103
> $ git checkout openjdk-bot-103
> 
> # Merge the target branch
> $ git merge foreign-memaccess+abi
> 
> 
> 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-103:103
> 
> 
> _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 incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains 808 additional commits since the last revision:

 - Undo merge error
 - Merge branch 'foreign-memaccess+abi' into 103
 - Merge master
 - 8261972: CLinker.C_VA_LIST layout does not match platform layout for va_list
   
   Reviewed-by: sundar, jvernee
 - Automatic merge of master into foreign-memaccess+abi
 - 8269807: Implement the fix for JDK-8269240 in the panama-foreign repo
   
   Reviewed-by: mcimadamore
 - Automatic merge of master into foreign-memaccess+abi
 - Add support for high-level functions to copy to and from Java arrays
   
   Reviewed-by: jvernee, uschindler
 - Merge master
 - Automatic merge of master into foreign-memaccess+abi
 - ... and 798 more: https://git.openjdk.java.net/panama-foreign/compare/dd878510...46931b19

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

Changes:
  - all: https://git.openjdk.java.net/panama-foreign/pull/572/files
  - new: https://git.openjdk.java.net/panama-foreign/pull/572/files/dd878510..46931b19

Webrevs:
 - full: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=572&range=01
 - incr: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=572&range=00-01

  Stats: 2479 lines in 40 files changed: 2137 ins; 190 del; 152 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/572.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/572/head:pull/572

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


More information about the panama-dev mailing list