[foreign-memaccess+abi] RFR: Merge master [v2]
J. Duke
duke at openjdk.org
Mon Jan 23 13:30:29 UTC 2023
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 140 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/java/lang/foreign/VaList.java
> - src/java.base/share/classes/jdk/internal/foreign/CABI.java
> - src/java.base/share/classes/jdk/internal/foreign/SystemLookup.java
> - src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
> - src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.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 +132:openjdk-bot-132
> $ git checkout openjdk-bot-132
>
> # 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-132:132
>
>
> _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 141 commits:
- Merge master
- Automatic merge of jdk:master into master
- 8281213: Unsafe uses of long and size_t in MemReporterBase::diff_in_current_scale
Reviewed-by: eastigeevich, kbarrett
- 8300087: Replace NULL with nullptr in share/cds/
Reviewed-by: dholmes, iklam
- 8300172: java/net/httpclient/MappingResponseSubscriber.java failed with java.net.ConnectException
Reviewed-by: jpai
- 8296403: [TESTBUG] IR test runner methods in TestLongRangeChecks.java invoke wrong test methods
Reviewed-by: thartmann, chagedorn, jiefu
- 8287873: Add test for using -XX:+AutoCreateSharedArchive with different JDK versions
Reviewed-by: iklam
- 8300400: Update --release 20 symbol information for JDK 20 build 32
Reviewed-by: iris, jjg
- 8300586: Refactor code examples to use @snippet in java.text.Collator
Reviewed-by: iris, lancea, naoto
- 8300356: Refactor code examples to use @snippet in java.text.CollationElementIterator
Reviewed-by: naoto
- ... and 131 more: https://git.openjdk.org/panama-foreign/compare/850aa09e...879ed68d
-------------
Changes: https://git.openjdk.org/panama-foreign/pull/772/files
Webrev: https://webrevs.openjdk.org/?repo=panama-foreign&pr=772&range=01
Stats: 15152 lines in 1000 files changed: 7869 ins; 1600 del; 5683 mod
Patch: https://git.openjdk.org/panama-foreign/pull/772.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign pull/772/head:pull/772
PR: https://git.openjdk.org/panama-foreign/pull/772
More information about the panama-dev
mailing list