[foreign-preview] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri Feb 18 11:07:22 UTC 2022
Hi all,
this is an _automatically_ generated pull request to notify you that there are 91 commits from the branch `master`that can **not** be merged into the branch `foreign-preview`:
The following file contains merge conflicts:
- src/java.base/share/classes/jdk/internal/foreign/SystemLookup.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-preview
$ git pull https://github.com/openjdk/panama-foreign.git foreign-preview
# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/panama-foreign.git +114:openjdk-bot-114
$ git checkout openjdk-bot-114
# Merge the target branch
$ git merge foreign-preview
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-114:114
_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
- 8282089: [BACKOUT] Parallel: Refactor PSCardTable::scavenge_contents_parallel
- 8277300: Issues with javadoc support for preview features
- 8281267: VM HeapDumper dumps array classes several times
- 8279068: IGV: Update to work with JDK 16 and 17
- 8281936: compiler/arguments/TestCodeEntryAlignment.java fails on AVX512 machines
- 8037573: Typo in DefaultTreeModel docs: askAllowsChildren instead of asksAllowsChildren
- 8282025: assert(ctrl != __null) failed: control out is assumed to be unique after JDK-8281732
- 8188073: Add Capstone as backend for hsdis
- 8282075: ProblemList 3 compiler/whitebox tests on macosx-x64
- ... and 81 more: https://git.openjdk.java.net/panama-foreign/compare/2d985cd7...cd3b60d5
The webrev contains the conflicts with foreign-preview:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=645&range=00.conflicts
Changes: https://git.openjdk.java.net/panama-foreign/pull/645/files
Stats: 12148 lines in 384 files changed: 8665 ins; 1981 del; 1502 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/645.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/645/head:pull/645
PR: https://git.openjdk.java.net/panama-foreign/pull/645
More information about the panama-dev
mailing list