[foreign-memaccess+abi] RFR: Merge master
J. Duke
duke at openjdk.org
Fri Mar 31 11:07:59 UTC 2023
Hi all,
this is an _automatically_ generated pull request to notify you that there are 90 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
The following files contains merge conflicts:
- src/java.base/share/classes/jdk/internal/foreign/CABI.java
- test/jdk/java/foreign/TestUnsupportedLinker.java
All Committers in this [project](https://openjdk.org/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.org/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 +137:openjdk-bot-137
$ git checkout openjdk-bot-137
# 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-137:137
_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
- 8305055: IR check fails on some aarch64 platforms
- 8305171: PPC: Should use IMA::load_resolved_indy_entry() in TIG::generate_return_entry_for()
- 8305174: disable dtrace for s390x builds
- 8304988: unnecessary dash in @param gives double-dash in docs
- 8305008: RISC-V: Factor out immediate checking functions from assembler_riscv.inline.hpp
- 8304993: bad sentence break in DateFormat
- 8305111: Locale.lookupTag has typo in parameter
- 8305142: Can't bootstrap ctw.jar
- 8202110: (fs) Remove FileSystem support for resolving against a default directory (chdir configuration)
- ... and 80 more: https://git.openjdk.org/panama-foreign/compare/2f78d6b5...8be67073
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.org/?repo=panama-foreign&pr=826&range=00.conflicts
Changes: https://git.openjdk.org/panama-foreign/pull/826/files
Stats: 15445 lines in 358 files changed: 7376 ins; 6352 del; 1717 mod
Patch: https://git.openjdk.org/panama-foreign/pull/826.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/826/head:pull/826
PR: https://git.openjdk.org/panama-foreign/pull/826
More information about the panama-dev
mailing list