[foreign-memaccess+abi] RFR: Merge master [v2]
J. Duke
duke at openjdk.org
Fri Feb 10 14:18:18 UTC 2023
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 100 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
>
> The following file contains merge conflicts:
>
> - make/autoconf/configure.ac
>
> All Committers in this [project](https://openjdk.org/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.org/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 +133:openjdk-bot-133
> $ git checkout openjdk-bot-133
>
> # 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-133:133
>
>
> _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 101 commits:
- Merge branch 'foreign-memaccess+abi' into 133
- Automatic merge of jdk:master into master
- 8301072: Replace NULL with nullptr in share/oops/
Reviewed-by: stefank, coleenp, dholmes
- 8302069: javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java update
Reviewed-by: cjplummer, amenkov
- 8302125: Make G1 full gc abort the VM after failing VerifyDuringGC verification
Reviewed-by: ayang, iwalulya
- 8302117: IgnoreUnrecognizedVMOptions flag causes failure in ArchiveHeapTestClass
Reviewed-by: dholmes
- 8293198: [vectorapi] Improve the implementation of VectorMask.indexInRange()
Reviewed-by: jbhateja, qamai, psandoz
- 8178806: Better exception logging in crypto code
Reviewed-by: valeriep
- 8245654: Add Certigna Root CA
Reviewed-by: mullan
- 8302109: Trivial fixes to btree tests
Reviewed-by: lmesnik
- ... and 91 more: https://git.openjdk.org/panama-foreign/compare/53114302...09bacda1
-------------
Changes: https://git.openjdk.org/panama-foreign/pull/785/files
Webrev: https://webrevs.openjdk.org/?repo=panama-foreign&pr=785&range=01
Stats: 14956 lines in 527 files changed: 9470 ins; 1667 del; 3819 mod
Patch: https://git.openjdk.org/panama-foreign/pull/785.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign pull/785/head:pull/785
PR: https://git.openjdk.org/panama-foreign/pull/785
More information about the panama-dev
mailing list