[foreign-memaccess+abi] RFR: Merge master [v2]
J.Duke
duke at openjdk.java.net
Tue Jun 15 18:07:33 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
J. Duke has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 142 commits:
- Merge branch 'foreign-memaccess+abi' into openjdk-bot-100
- Automatic merge of jdk:master into master
- 8268565: runtime/records/RedefineRecord.java should be run in driver mode
Reviewed-by: hseigel
- 8267930: Refine code for loading hsdis library
Reviewed-by: whuang, neliasso, ysuenaga
- 8268574: ProblemList tests failing due to UseBiasedLocking going away
Reviewed-by: cjplummer
- 8267556: Enhance class paths check during runtime
Reviewed-by: minqi, iklam
- 8267893: Improve jtreg test failure handler do get native/mixed stack traces for cores and live processes
Reviewed-by: iignatyev
- 8268223: Problemlist vmTestbase/nsk/jdi/HiddenClass/events/events001.java
Reviewed-by: amenkov, sspitsyn
- 8268539: several serviceability/sa tests should be run in driver mode
Reviewed-by: sspitsyn
- 8268361: Fix the infinite loop in next_line
Reviewed-by: dholmes, sgehwolf, sspitsyn
- ... and 132 more: https://git.openjdk.java.net/panama-foreign/compare/3cc47de0...c74525ac
-------------
Changes: https://git.openjdk.java.net/panama-foreign/pull/556/files
Webrev: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=556&range=01
Stats: 49958 lines in 839 files changed: 39954 ins; 5667 del; 4337 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