[foreign-memaccess+abi] RFR: Merge master [v2]
J. Duke
duke at openjdk.org
Fri Jan 13 11:48:39 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`:
>
> The following files contains merge conflicts:
>
> - src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/linux/LinuxAArch64VaList.java
> - src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/SysVVaList.java
> - test/jdk/java/foreign/valist/VaListTest.java
>
> 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 +131:openjdk-bot-131
> $ git checkout openjdk-bot-131
>
> # 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-131:131
>
>
> _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 master
- Automatic merge of jdk:master into master
- 8299957: Enhance error logging in instrument coding with additional jplis_assert_msg
Reviewed-by: sspitsyn
- 8300040: TypeOopPtr::make_from_klass_common calls itself with args in wrong order
Co-authored-by: David Simms <dsimms at openjdk.org>
Reviewed-by: chagedorn, kvn
- 8300068: UBSan CFLAGS/LDFLAGS not passed when building ADLC
Reviewed-by: ihse
- Merge
- 8299918: Update Xcode11.3.1-MacOSX10.15 devkit at Oracle
Reviewed-by: erikj
Backport-of: a17b563f54b2e0953a1dd9a613e6d5e0e9a8e4cb
- 8299034: Runtime::exec clarification of inherited environment
Reviewed-by: alanb
- 8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR
Reviewed-by: naoto
Backport-of: 3b374c0153950ab193f3a188b57d3404b4ce2fe2
- 8299090: Specify coordinate order for additional CaptureCallState parameters on class as well
Reviewed-by: pminborg, mcimadamore
- ... and 98 more: https://git.openjdk.org/panama-foreign/compare/a263977c...f1236f0b
-------------
Changes: https://git.openjdk.org/panama-foreign/pull/769/files
Webrev: https://webrevs.openjdk.org/?repo=panama-foreign&pr=769&range=01
Stats: 8129 lines in 315 files changed: 5029 ins; 1788 del; 1312 mod
Patch: https://git.openjdk.org/panama-foreign/pull/769.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign pull/769/head:pull/769
PR: https://git.openjdk.org/panama-foreign/pull/769
More information about the panama-dev
mailing list