[foreign-memaccess+abi] RFR: Merge master [v2]
J. Duke
duke at openjdk.org
Fri Mar 10 14:21:52 UTC 2023
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 107 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
>
> Over 14 files contains merge conflicts.
>
> 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 +135:openjdk-bot-135
> $ git checkout openjdk-bot-135
>
> # 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-135:135
>
>
> _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 108 commits:
- Merge branch 'foreign-memaccess+abi' into openjdk-bot-135
- Automatic merge of jdk:master into master
- 8294971: jdk.jlink jdk.tools.jimage.JImageTask is using ASM to verify classes
Reviewed-by: mchung
- 8303822: gtestMain should give more helpful output
Reviewed-by: lmesnik
- 8303624: The java.lang.Thread.FieldHolder can be null for JNI attaching threads
Reviewed-by: alanb, dcubed
- 8302360: Atomic*.compareAndExchange Javadoc unclear
Reviewed-by: martin, dholmes
- 8302779: HelidonAppTest.java fails with "assert(_cb == CodeCache::find_blob(pc())) failed: Must be the same" or SIGSEGV
Reviewed-by: coleenp, sspitsyn
- 8303691: Fedora based devkit build should load more packages from archive location
Reviewed-by: mbaesken, erikj
- 8303924: ProblemList serviceability/sa/UniqueVtableTest.java on Linux
Reviewed-by: dcubed
- 8303609: ProblemList serviceability/sa/TestSysProps.java with ZGC
Reviewed-by: dcubed
- ... and 98 more: https://git.openjdk.org/panama-foreign/compare/2a22d914...d21c2089
-------------
Changes: https://git.openjdk.org/panama-foreign/pull/817/files
Webrev: https://webrevs.openjdk.org/?repo=panama-foreign&pr=817&range=01
Stats: 73308 lines in 1052 files changed: 61969 ins; 3262 del; 8077 mod
Patch: https://git.openjdk.org/panama-foreign/pull/817.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign pull/817/head:pull/817
PR: https://git.openjdk.org/panama-foreign/pull/817
More information about the panama-dev
mailing list