[foreign-memaccess+abi] RFR: Merge master [v2]
J. Duke
duke at openjdk.org
Fri Mar 3 15:31:58 UTC 2023
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 81 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
>
> Over 11 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 +134:openjdk-bot-134
> $ git checkout openjdk-bot-134
>
> # 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-134:134
>
>
> _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 82 commits:
- Merge branch 'foreign-memaccess+abi' into openjdk-bot-134
- Automatic merge of jdk:master into master
- 8303539: javadoc typos in Attr
Reviewed-by: iris, jjg
- 8303473: Add implied {@code} in java.lang.invoke.MethodHandles
Reviewed-by: jjg, lancea, mchung
- 8143900: OptimizeStringConcat has an opaque dependency on Integer.sizeTable field
Reviewed-by: kvn, thartmann
- 8302830: AArch64: Fix the mismatch between cas.m4 and aarch64.ad
Reviewed-by: aph, xgong
- 8302783: Improve CRC32C intrinsic with crypto pmull on AArch64
Reviewed-by: simonis, phh
- 8303405: fix @returnss typo in ReflectionFactory
Reviewed-by: jpai, mchung, martin, iris, lancea, naoto
- 8302495: update for deprecated sprintf for java.desktop
Reviewed-by: prr
- 8303442: Clean up w2k_lsa_auth linker parameters
Reviewed-by: erikj
- ... and 72 more: https://git.openjdk.org/panama-foreign/compare/82e8c9df...8ec4fe14
-------------
Changes: https://git.openjdk.org/panama-foreign/pull/808/files
Webrev: https://webrevs.openjdk.org/?repo=panama-foreign&pr=808&range=01
Stats: 10061 lines in 440 files changed: 6067 ins; 2101 del; 1893 mod
Patch: https://git.openjdk.org/panama-foreign/pull/808.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign pull/808/head:pull/808
PR: https://git.openjdk.org/panama-foreign/pull/808
More information about the panama-dev
mailing list