[foreign-memaccess+abi] RFR: Merge master
J. Duke
duke at openjdk.org
Fri May 12 11:08:51 UTC 2023
Hi all,
this is an _automatically_ generated pull request to notify you that there are 125 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/abi/AbstractLinker.java
- test/jdk/java/foreign/enablenativeaccess/panama_module/org/openjdk/foreigntest/libLinkerInvokerModule.cpp
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 +139:openjdk-bot-139
$ git checkout openjdk-bot-139
# 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-139:139
_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
- 8307961: java/foreign/enablenativeaccess/TestEnableNativeAccess.java fails with ShouldNotReachHere
- 8307806: Rename Atomic::fetch_and_add and friends
- 8305770: os::Linux::available_memory() should refer MemAvailable in /proc/meminfo
- 8305083: Remove finalize() from test/hotspot/jtreg/vmTestbase/nsk/share/ and /jpda that are used in serviceability/dcmd/framework tests
- 8307518: Remove G1 workaround in jstat about zero sized generation sizes
- 8306667: RISC-V: Fix storeImmN0 matching rule by using zr register
- 8307891: ProblemList gtest/NMTGtest.java subtests on aix
- 8307520: set minimum supported CPU architecture to Power8 on AIX
- 8307969: [zgc] Missing includes in gc/z/zTracer.cpp
- ... and 115 more: https://git.openjdk.org/panama-foreign/compare/eedac4bf...fd013a58
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.org/?repo=panama-foreign&pr=832&range=00.conflicts
Changes: https://git.openjdk.org/panama-foreign/pull/832/files
Stats: 107174 lines in 1722 files changed: 86082 ins; 8822 del; 12270 mod
Patch: https://git.openjdk.org/panama-foreign/pull/832.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/832/head:pull/832
PR: https://git.openjdk.org/panama-foreign/pull/832
More information about the panama-dev
mailing list