[foreign-memaccess+abi] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri Oct 29 11:08:56 UTC 2021
Hi all,
this is an _automatically_ generated pull request to notify you that there are 82 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/invoke/MethodHandleImpl.java
- src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java
All Committers in this [project](https://openjdk.java.net/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.java.net/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 +104:openjdk-bot-104
$ git checkout openjdk-bot-104
# 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-104:104
_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
- 8276102: JDK-8245095 integration reverted JDK-8247980
- 8276086: Increase size of metaspace mappings
- 8276047: G1: refactor G1CardSetArrayLocker
- 8275909: [JVMCI] c2v_readFieldValue use long instead of jlong for the offset parameter
- 8275856: Remove MetaspaceHandleDeallocations debug switch
- 8275440: Remove VirtualSpaceList::is_full()
- 8257722: Improve "keytool -printcert -jarfile" output
- 8274848: LambdaMetaFactory::metafactory on REF_invokeSpecial impl method has incorrect behavior
- 8275308: Add valueOf(Runtime.Version) factory to SourceVersion
- ... and 72 more: https://git.openjdk.java.net/panama-foreign/compare/309df8af...12cee54c
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=606&range=00.conflicts
Changes: https://git.openjdk.java.net/panama-foreign/pull/606/files
Stats: 13887 lines in 413 files changed: 10603 ins; 1688 del; 1596 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/606.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/606/head:pull/606
PR: https://git.openjdk.java.net/panama-foreign/pull/606
More information about the panama-dev
mailing list