[foreign-memaccess+abi] RFR: Merge master
J. Duke
duke at openjdk.org
Fri Jan 20 11:09:32 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
-------------
Commit messages:
- Automatic merge of jdk:master into master
- 8281213: Unsafe uses of long and size_t in MemReporterBase::diff_in_current_scale
- 8300087: Replace NULL with nullptr in share/cds/
- 8300172: java/net/httpclient/MappingResponseSubscriber.java failed with java.net.ConnectException
- 8296403: [TESTBUG] IR test runner methods in TestLongRangeChecks.java invoke wrong test methods
- 8287873: Add test for using -XX:+AutoCreateSharedArchive with different JDK versions
- 8300400: Update --release 20 symbol information for JDK 20 build 32
- 8300586: Refactor code examples to use @snippet in java.text.Collator
- 8300356: Refactor code examples to use @snippet in java.text.CollationElementIterator
- Merge
- ... and 130 more: https://git.openjdk.org/panama-foreign/compare/d7a86210...c2b39dbf
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.org/?repo=panama-foreign&pr=772&range=00.conflicts
Changes: https://git.openjdk.org/panama-foreign/pull/772/files
Stats: 15499 lines in 1003 files changed: 8211 ins; 1599 del; 5689 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