[foreign-memaccess+abi] RFR: Merge master [v2]
J.Duke
duke at openjdk.java.net
Fri Feb 25 17:25:18 UTC 2022
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 68 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
>
> The following file contains merge conflicts:
>
> - src/hotspot/cpu/aarch64/macroAssembler_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 +115:openjdk-bot-115
> $ git checkout openjdk-bot-115
>
> # 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-115:115
>
>
> _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 69 commits:
- Merge branch 'foreign-memaccess+abi' into 115
- Automatic merge of jdk:master into master
- 8282347: AARCH64: Untaken branch in has_negatives stub
Reviewed-by: aph, haosun, thartmann
- 8206187: javax/management/remote/mandatory/connection/DefaultAgentFilterTest.java fails with Port already in use
Reviewed-by: msheppar, amenkov
- 8280357: user.home = "?" when running with systemd DynamicUser=true
Reviewed-by: naoto, alanb
- 8005885: enhance PrintCodeCache to print more data
Reviewed-by: xliu, phh
- 8281525: Enable Zc:strictStrings flag in Visual Studio build
Reviewed-by: dholmes, ihse
- 8282307: Parallel: Incorrect discovery mode in PCReferenceProcessor
Reviewed-by: tschatzl, kbarrett
- 8282348: Remove unused CardTable::dirty_card_iterate
Reviewed-by: kbarrett
- 8277204: Implement PAC-RET branch protection on Linux/AArch64
Reviewed-by: erikj, ihse, adinn, ngasson
- ... and 59 more: https://git.openjdk.java.net/panama-foreign/compare/6af29ab1...a2f60d24
-------------
Changes: https://git.openjdk.java.net/panama-foreign/pull/656/files
Webrev: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=656&range=01
Stats: 8056 lines in 192 files changed: 5290 ins; 1119 del; 1647 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/656.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/656/head:pull/656
PR: https://git.openjdk.java.net/panama-foreign/pull/656
More information about the panama-dev
mailing list