[foreign-memaccess+abi] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri May 13 11:40:03 UTC 2022
Hi all,
this is an _automatically_ generated pull request to notify you that there are 118 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
Over 22 files contains merge conflicts.
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 +122:openjdk-bot-122
$ git checkout openjdk-bot-122
# 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-122:122
_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
- 8282160: JShell circularly-required classes cannot be defined
- 8286117: Remove unnecessary indirection and unused code in UL
- 8286623: Bundle zlib by default with JDK on macos aarch64
- 8286647: JFR: Build failure when C1 or C2 is disabled after JDK-8282420
- 8286677: [BACKOUT] (fc) Tune FileChannel.transferFrom()
- 8286424: GetVersionEx is deprecated
- 8274113: (fc) Tune FileChannel.transferFrom()
- 8285951: Replace Algorithms.eatMemory(...) with WB.fullGC() in vmTestbase_vm_gc_ref tests
- 8286386: Address possibly lossy conversions in java.net.http
- ... and 108 more: https://git.openjdk.java.net/panama-foreign/compare/ec31965d...3e21600a
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=682&range=00.conflicts
Changes: https://git.openjdk.java.net/panama-foreign/pull/682/files
Stats: 190793 lines in 1916 files changed: 148433 ins; 33009 del; 9351 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/682.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/682/head:pull/682
PR: https://git.openjdk.java.net/panama-foreign/pull/682
More information about the panama-dev
mailing list