[foreign-memaccess+abi] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri Jun 11 11:08:34 UTC 2021
Hi all,
this is an _automatically_ generated pull request to notify you that there are 141 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/CLinker.java
- src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/SystemLookup.java
- src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/abi/SharedUtils.java
- test/jdk/java/foreign/TestUpcallException.java
- test/jdk/java/foreign/ThrowingUpcall.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 +100:openjdk-bot-100
$ git checkout openjdk-bot-100
# 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-100:100
_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
- 8268565: runtime/records/RedefineRecord.java should be run in driver mode
- 8267930: Refine code for loading hsdis library
- 8268574: ProblemList tests failing due to UseBiasedLocking going away
- 8267556: Enhance class paths check during runtime
- 8267893: Improve jtreg test failure handler do get native/mixed stack traces for cores and live processes
- 8268223: Problemlist vmTestbase/nsk/jdi/HiddenClass/events/events001.java
- 8268539: several serviceability/sa tests should be run in driver mode
- 8268361: Fix the infinite loop in next_line
- 8267630: Start of release updates for JDK 18
- ... and 131 more: https://git.openjdk.java.net/panama-foreign/compare/4bcfd54d...37791a84
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=556&range=00.conflicts
Changes: https://git.openjdk.java.net/panama-foreign/pull/556/files
Stats: 50423 lines in 846 files changed: 40376 ins; 5696 del; 4351 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/556.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/556/head:pull/556
PR: https://git.openjdk.java.net/panama-foreign/pull/556
More information about the panama-dev
mailing list