[foreign-memaccess+abi] RFR: Merge master [v2]
J.Duke
duke at openjdk.java.net
Fri Jan 21 15:58:07 UTC 2022
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 141 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/aarch64/macroAssembler_aarch64.cpp
> - src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
> - src/hotspot/cpu/aarch64/universalUpcallHandler_aarch64.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 +113:openjdk-bot-113
> $ git checkout openjdk-bot-113
>
> # 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-113:113
>
>
> _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 652 additional commits since the last revision:
- Merge branch 'foreign-memaccess+abi' into openjdk-bot-113
- 8277845: Clean up use if ProgrammableInvoker/UpcallHandler.USE_INTRINSICS in tests.
Reviewed-by: mcimadamore
- Automatic merge of master into foreign-memaccess+abi
- Merge master
- Automatic merge of master into foreign-memaccess+abi
- Automatic merge of master into foreign-memaccess+abi
- Automatic merge of master into foreign-memaccess+abi
- 8278151: Heap segments should handle alignment constraints in a deterministic fashion
Reviewed-by: psandoz, jvernee
- Merge master
- Merge master
- ... and 642 more: https://git.openjdk.java.net/panama-foreign/compare/497f3acf...ab04ea8c
-------------
Changes:
- all: https://git.openjdk.java.net/panama-foreign/pull/632/files
- new: https://git.openjdk.java.net/panama-foreign/pull/632/files/497f3acf..ab04ea8c
Webrevs:
- full: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=632&range=01
- incr: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=632&range=00-01
Stats: 30345 lines in 126 files changed: 26914 ins; 2660 del; 771 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/632.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/632/head:pull/632
PR: https://git.openjdk.java.net/panama-foreign/pull/632
More information about the panama-dev
mailing list