[foreign-memaccess+abi] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri Jan 7 11:09:11 UTC 2022
Hi all,
this is an _automatically_ generated pull request to notify you that there are 43 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
The following files contains merge conflicts:
- src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryAddress.java
- src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemorySegment.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 +112:openjdk-bot-112
$ git checkout openjdk-bot-112
# 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-112:112
_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
- 8279547: [vectorapi] Enable vector cast tests after JDK-8278948
- 8279258: Auto-vectorization enhancement for two-dimensional array operations
- 8279520: SPNEGO has not passed channel binding info into the underlying mechanism
- 4884570: StreamPrintService.isAttributeValueSupported does not work properly for SheetCollate
- 8273322: Enhance macro logic optimization for masked logic operations.
- 8279505: Update documentation for RETRY_COUNT and REPEAT_COUNT
- 8279339: (ch) Input/Output streams returned by Channels factory methods don't support concurrent read/write ops
- 8211004: javac is complaining about non-denotable types and refusing to generate the class file
- Merge
- ... and 33 more: https://git.openjdk.java.net/panama-foreign/compare/20b47439...8e2fc4c7
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=628&range=00.conflicts
Changes: https://git.openjdk.java.net/panama-foreign/pull/628/files
Stats: 4644 lines in 120 files changed: 3950 ins; 409 del; 285 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/628.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/628/head:pull/628
PR: https://git.openjdk.java.net/panama-foreign/pull/628
More information about the panama-dev
mailing list